Merge "Changes to MbmsStreamingManager for test app"
am: df57734354

Change-Id: I661e2cb4609f556d31e464d1cadff459b9b80354