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

Change-Id: Ia78647742f44c9dc51d030d984b0dc9332139044