Merge change 22950 into eclair

* changes:
  Change these string constants back to match donut.