Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
am: a72902a079

Change-Id: I6825cfec699dbe1135ee12df0ce81052d7e57304