Merge changes from topic 'am-0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp
am: b373c6e3b2

Change-Id: Iae074efe94e3a3c2a4767705049e3cab6b4724f0