Synced to //developers/samples/android commit 7bc4d37c1eddd8b7a464a7f7fdc26b51387cf968. Change-Id: If83a3a126ffc0f6218419caa647975ed0b2b3cc8
Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b