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