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