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