[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev am: ce05315be8 am: 7f1c11536e am: fdf2401dd4

Change-Id: I4a63beee773cfc34699294447dfede4633b058da