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

Change-Id: I4e64393422612aef8f6ea90d39cdcb89d3e2d905