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

* commit '26dd9bb367a51acf0c1a96e0c765a880b91f9f93':
  Fixing Video perf test