[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541 am: f4e8657a0e am: 2d3b87ce06 am: 5558a64435 am: 484e2c4ea1

Change-Id: I3ac80738b27ecd44b56724595678ebc1bff44044