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

Change-Id: I56e81d42e5a0c48fca9029faa254cb7aa345cb50