Merge "Revert "Revert "Revert "Revert "Make NewInstanceString test returned String contents.""""" am: 0cf96181 am: dafdca8a Change-Id: I33a787a714a13fba66770291d7448105eb185721