am 6aa5861e: am 09727996: am b7072d7b: am d7e74bd3: Merge "Fix media stress tests." into lmp-sprout-dev

* commit '6aa5861ee29196ea7f9e17e47b2f5e63a486932b':