Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242 am: 4de6420978
am: 9408a33b7e

Change-Id: Ib8a57869ce456e65069c5d63d99f9a80aa7258ca