Merge "Make changes to MBMS Streaming APIs per recommendations"