Merge changes from topic "am-af5c0c5c2bcd4afbaf47a700c94e59ee"

* changes:
  Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev am: aee278d6 am: c83e4e96
  Embms API adjustments for 7/21 am: 0bd7a605  -s ours am: 48605ad6
  Fix lint errors in the streaming API am: 4f306ded  -s ours am: b6fd2ba1
  Mock-un-hide the MBMS streaming APIs am: 1169bc59  -s ours am: 4c44badf  -s ours