[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4 am: e4aea51b88 am: 53f19a4746

Change-Id: I22d4ffe0a4ff45d71e97fb1ad0755407a5d61c30