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

Change-Id: Iebea130f19c60c407a95ff1c1a3f80abd7c66925