Merge changes from topic "embms-cherry-pick" into oc-mr1-dev

* changes:
  Make EMBMS adjustments for 08/04
  Prepare EMBMS apis for un-hiding