Merge "Fix debugger calling new String()."
am: 786bce8aec

Change-Id: I16f869c85b1db84ca6aaa6a77437a23445203a56