Merge change I610062f6 into eclair

* changes:
  Since string is freeze now. Change it to an existed one.