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

Change-Id: Ie9793c74f211c553bdf892a34889844792879946