Synced to //developers/samples/android commit 89d2da0f4b. Change-Id: I904da8210517922531d1ac1ba1e747f1c7bf00b3
Synced with /developers/samples/android commit 415e5ce8ad7128bed20c28e923f2f91bbfff46a9. Change-Id: I8716d051213210ec991fb692f79848a9f086a52c