Synced to developers/samples/android commit 54bab34b386e343e9d0ea75a5fb8d13db2c71eb5. Change-Id: I1c9d9d2c1f53a051d7b4d85303d5c01ab6f16e68
Synced to developers/samples/android commit 54bab34b386e343e9d0ea75a5fb8d13db2c71eb5. Change-Id: I1c9d9d2c1f53a051d7b4d85303d5c01ab6f16e68