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

* commit '5090f7171a4472059b8c9d95f45deb0f14f909f2':