am 4b596e10: am d534fee6: am 26dd9bb3: Merge "Fixing Video perf test" into klp-dev

* commit '4b596e102e8e16cb1da163d24131f3b4fecf6b80':
  Fixing Video perf test