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

* commit '0a912c0cadf8e1566fb3644400e313892929d680':