Synced with developers/samples/android commit 0a4e12c1bc019a34549c6e88260879e2da49ce7c. Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b