[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-mr1-dev am: 541979d825 am: 38e3c9319a am: 18bf1ab9a8

Change-Id: Ic4f19d849e6efdf5b5ef469924861a8404d65a72