Merge change 26492 into eclair

* changes:
  Fix http://b/2131805. Just let make those long string be in two lines.