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