[automerger] Merge changes from topic "am-88210eb69d8c4cf6b06aad4274f64703" into nyc-dev am: c280a98218 am: a4a7a5a45c am: 5a9f075470

Change-Id: I8e0f3f4526f538d1d4fcc10b99f73c7a9e3c81de