Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
am: 53095bb5bd  -s ours

Change-Id: Ie2f8c1e18acf57238fe4816812562ecd1644cf51