Synced to //developers/samples/android commit 7c1cbd61d1dea342322530bee4228d0d86bdeca1. Change-Id: I682ebe15bb1d495866dbc8d43453cd7351aef5db
Synced to //developers/samples/android commit 7c1cbd61d1dea342322530bee4228d0d86bdeca1. Change-Id: I682ebe15bb1d495866dbc8d43453cd7351aef5db