Merge "Changes to MbmsStreamingManager for test app"