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