[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768 am: c2f948ccc1 am: 4c4cf86e9d

Change-Id: I35be37f32451b472b8b5eedc8334ac09abc0a13c