Merge "Revert "Fix debugger calling new String().""
am: f91b5f3372

Change-Id: Ie1103da43144d9bfadbd56dcb6f83b219ea0d012