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

Change-Id: I69d8ec8044ac18e6eab60d099934b331949a6a94