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

Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b