[automerger] Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c am: cb42932a3b am: 22efdf314f am: aef3e27fe7

Change-Id: I2e771fa77163988afe5b0eb2080c2eb230ee3ccf