Merge change 20781

* changes:
  replace 'new String()' with ""