Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"

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