[automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am: bd629f69ed am: 1d10387f0d

Change-Id: Iafbde79d1e7d4342b305726fd7b6e58984d98972