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