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

* commit '8e09984a56a4ff12c8726d7c2c6902f1bf081d6f':
  Fix media stress test.