[automerger] Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-dr1-dev am: 72c25a33 am: 99d693c8 Change-Id: I2ea1ecd3c9e2c6cc8d8de235015fb315ba3ad24f