Synced to //developers/samples/android commit 89d2da0f4b. Change-Id: I904da8210517922531d1ac1ba1e747f1c7bf00b3
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508