[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d97 am: c2f948cc am: 4c4cf86e am: 7179a342 Change-Id: Id872a1a9d460df227fb13f757516a8b1bae36d25