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

Change-Id: Ie1e84362315d77d598561cb9583f95d185e6a017