Synced to //developers/samples/android commit 44c699bf11bae6c9eef1f8c56bd405d547e179e6. Change-Id: I61ceec197e6fa420fc5a6d16e703aa1aab2b0c4e
Synced to //developers/samples/android commit 44c699bf11bae6c9eef1f8c56bd405d547e179e6. Change-Id: I61ceec197e6fa420fc5a6d16e703aa1aab2b0c4e