Synced to //developers/samples/android commit 1a0b1951b01698fe28a2fa59ba76a2e8076afc84. Change-Id: I98ab8b96eb0d0cf491d3202b0371176c03847886
Synced to //developers/samples/android commit 7bc4d37c1eddd8b7a464a7f7fdc26b51387cf968. Change-Id: If83a3a126ffc0f6218419caa647975ed0b2b3cc8