Merge "Revert "Revert "Fixed Literal String intern mismatch."""
am: 0656044bf8

Change-Id: I2ba3889ef26ef35c8f903805a444e61382a9b276