Merge "Unhide EMBMS download API" am: 0285ee851d am: e9b31e8eaf am: c55378fad4
am: ca077a992d

Change-Id: I5ffe374cc11824d456fff1981a5a83e0a03f4e84