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

Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6