[automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dev am: 3dfcf78e am: 63b4aae5 am: a199c8bf Change-Id: If898afe6c3fe9ce6de0a75499bafaa61eb4eedf9