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

Change-Id: I99f233a28af2fab7570fadaa5342ad19e2fd0a57