am 98d18bbc: Merge "Fix media stress test." into klp-dev

* commit '98d18bbc5e59c98c890593d521b5b641030a5f1d':
  Fix media stress test.