Synced to developers/samples/android commit 121d61a3334fd4999d3cb6553f2356eb8893d19b. Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
Synced to developers/samples/android commit 121d61a3334fd4999d3cb6553f2356eb8893d19b. Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92