Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev am: b9d2b56c61  -s ours
am: c98bf2f7f4

Change-Id: I2145da40b5bd1bfb3afcbe191f3651767ccc870d