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