[automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-mr1-dev am: 72e1c026ed am: 05bf11c02c am: 9eeeafcd70

Change-Id: Ibd6756d11092a3ad1890cb6a5e801d92fe93c4e2