Merge "Revert "Revert "Revert "Make NewInstanceString test returned String contents."""" am: 8629824d am: f665b045 Change-Id: I0c3094eed582f47b7964f6d9a290c03674688b2f