Merge changes from topic 'am-362bf7c96f9743c8bcc779c76a1a5b3f' into nyc-mr1-dev-plus-aosp
am: de146a075f

Change-Id: Ifd435d7c9345db5b5736ebbbb393aa6f55933b45