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

Change-Id: I7028ef23f597e6e82ecdb6c11a6c8dcdb1d1f77b