[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e am: c8d99435 am: 117c674e Change-Id: I1fd6fa75b345a810ae53784b5b56004927cc35a9