Merge changes from topic \'am-e885a22f20324bb0b94c97a807186535\' into nyc-mr1-dev-plus-aosp
am: 268b04e160

* commit '268b04e16052d5ef76954b6688f9d35b23509d83':

Change-Id: Ia32b871506040920765c906d324fb7df3f98c1bb