Synced to developers/samples/android commit 97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910. Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
Bug: 17473824 Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994