[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e am: db125f50 am: afcd0fe4 am: 97eb85c0 Change-Id: Ie45ad839d63a64264d961ccc82afddfb75c610ee