am 076035a1: Merge "Fix latency test." into klp-dev

* commit '076035a183aa61023b335e9bb3dfe8d6ef967ae2':
  Fix latency test.