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

Change-Id: I1b5e5717811398e6f2b7b2c1edd6008cdf75754d