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

Change-Id: I1dcd805c52aa62336db4cfa6a52761d7a704ab2b