Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2
am: 8c4179e88c

Change-Id: Ic6c1ec0845cae8b2134b9cb043d185f5e532596c