Merge change 22551 into eclair

* changes:
  Fix broken unit test.