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

Change-Id: I10dc080c5cc37c988ee1cdf7695cb291726a95c9