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

Change-Id: Ia2dc38c96db895a7fc1d8ab4127f926b65ce71f5