Synced to //developers/samples/android commit 57690c2111. Change-Id: Ie10e7bbcf4fd9dfb4db02b8cffa4e47d88076315