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

Change-Id: Iabb3be0a6522b9ec2002b7b28c7a50c9187ee424