Synced to //developers/samples/android commit ec5f8543a1e474570a257df386260ac8a206aded. Change-Id: I6424be01378300c9c35446f12bb8ad43d771d238
Synced to //developers/samples/android commit ec5f8543a1e474570a257df386260ac8a206aded. Change-Id: I6424be01378300c9c35446f12bb8ad43d771d238