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

Change-Id: I0ec5194fe29f2b057acbdd69dd9c361db34258d7