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

Change-Id: I03b30e6a3ed501c6ce27d2c5e231867175543c90