[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1

Change-Id: Ie3405b9e4ff95c8974e9a7f08ca949112b161002