Merge change 22496 into eclair

* changes:
  fix typo