Merge changes from topic 'am-295882f6444845b0a2bcae920cb1f84d' into nyc-mr2-dev-plus-aosp
am: b49dd83efc

Change-Id: Icbebc83c2cc09d958be51e64d9bba54f67ef6304