Synced to //developers/samples/android commit 243feb49e8d1753b746f69ae5519eaace0e50605. Change-Id: I9255d2ad8f68669d77124b7840184171fb5a801b
Change-Id: I952db10d9c9acb4940db08a07789347ea2effe4d