[automerger] Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev am: 82e4ecfee6 am: e6e80e6ad1

Change-Id: I29e188d7e729ffbe50f4dee6b55d48d31cf413c3