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

* commit 'd534fee63847eaa8c305463e48711ac353737f01':
  Fixing Video perf test