Synced to //developers/samples/android commit 7e6f96a4bd8d07daf2f9e464dad32e7daa62999b Change-Id: I3c44d32aca1a5513f52e71f28d1848a055d03aab
Synced to //developers/samples/android commit 7e6f96a4bd8d07daf2f9e464dad32e7daa62999b Change-Id: I3c44d32aca1a5513f52e71f28d1848a055d03aab