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

Change-Id: Ib39d79b8cc592f361f0c53a34f3acb9e39a18a61