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