Synced to developers/samples/android commit bc036ecdf44cd03163c206096172299f3940b057. Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
Bug: 17473824 Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994