Merge "Revert "Fixed Literal String intern mismatch.""