Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev
am: aee278d6d8

Change-Id: I4c59d502b3764d0fee6266ab9b87617a02ae805d