Merge "Unhide EMBMS download API" into oc-mr1-dev
am: 5dab2f297c  -s ours

Change-Id: Ifa5e4aede36e590afd0afb86234793a5b0b11047