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

Change-Id: I4ace6e884b914f208f404541f8a3c48df9fc15a9