Merge remote-tracking branch 'goog/nyc-mr1-dev-plus-aosp' into HEAD am: 6432f6a84d
am: 5fe9435edb

Change-Id: Icdd0126dffd8101de89cf537057a7a3a952c302e