Merge change 22561 into eclair

* changes:
  Performance measurement framework: