[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85 am: c8d99435c1

Change-Id: I694605b85bb5b5d123663c7fe670274cb2e15f36