Merge "Fix media stress test." into klp-dev