[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f7802275 am: f4e8657a Change-Id: I56732739223c1b8030a1bfb4e50713fe0cc82a41