Merge "Revert "Revert "Fix debugger calling new String()."""