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