Merge change 25502 into eclair

* changes:
  Fix typo