Merge changes from topic 'am-cca20719ce864a0298fe5d9833985170' into nyc-mr1-dev-plus-aosp
am: 09f832c851

Change-Id: Iee5f602da5588b4d24b1d260fbedbb0b2521b609