Merge "Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca am: 8e03a859cc" into nyc-mr1-dev-plus-aosp
am: 638243edca

* commit '638243edca9696bbb58fde334babe7536c4b65df':

Change-Id: Ie5c41d545f0e10d21c1cfa1b3b3fd6c532f895a8