am d7e74bd3: Merge "Fix media stress tests." into lmp-sprout-dev

* commit 'd7e74bd3fdac0b96c2efa0cfd343f260fb2e4755':
  Fix media stress tests.