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

Change-Id: Id8945c8b6e242cd0d72ea31f25798ad6822e90f7