Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
Change-Id: I58e10e787f5df668331fc04e97a6c2efcd75f76f