Merge changes from topic 'am-ab5a4652666d48ceb062fc19a935f1c6' into nyc-mr2-dev-plus-aosp
am: 7436a2a54c

Change-Id: I3a076519359505df52499745b0b02be77f0ea9ba