[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev am: 8c7913271e am: dd96a6df71

Change-Id: I5e6a2ea1e0ee0b4f7e7336cc24cbc68d8f768ee3