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

Change-Id: I309db43f32858239c8ac66281479b28f8c4941da