[automerger] Merge changes from topic "am-5755dd9bae474279bfde03edb851954a" into nyc-mr1-dev am: 761268ab1c am: 4fd98e6ecd

Change-Id: I12677dbf3edfa4a319acbcfae56a3159239519e8