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