Syncing to //developers/samples/android commmit 2be5f5ca32. Change-Id: Ia08c63655bd122c7fbb0cc3a50eec95d8edcb3f1
Synced with /developers/samples/android commit 415e5ce8ad7128bed20c28e923f2f91bbfff46a9. Change-Id: I8716d051213210ec991fb692f79848a9f086a52c