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

Change-Id: I50671942cf3bc05188a5ffc6a19b04aef69f2134