[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a

Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1