Merge changes from topic 'am-a4406a3abc304bda91eea9becf864ba6' into nyc-mr2-dev-plus-aosp
am: 8f8dc01b3a  -s ours

Change-Id: I0e6bf08d68a8634d3c65edf70d0a85795f31693c