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