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

Change-Id: I24d682a9c13a7b6e16bc2e265468947fbe8dd64a