Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev