Synced to //developers/samples/android commit 7bc4d37c1eddd8b7a464a7f7fdc26b51387cf968. Change-Id: If83a3a126ffc0f6218419caa647975ed0b2b3cc8
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508