Merge changes from topic "embms-cherry-pick" into oc-mr1-dev am: bbe2753dbb  -s ours
am: a51e0d3b93

Change-Id: I048514a6a71a15465eec4fba94fceb84f0b173d4