[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7

Change-Id: I2fa9e265ba2ce5e35c079eee53fd2bd1521118c8