Merge "Revert "Revert "Revert "Make NewInstanceString test returned String contents."""" am: 8629824d am: f665b045 am: d2ffdc1d am: 18e98fe4 Change-Id: I1849ab9bffe7b4fb296c4e7b93e032341eae2680