Merge "Revert "Fixed Literal String intern mismatch."" am: 61c42e94af
am: 7c2f29f774

Change-Id: I465eaf2e2aebf4acaadf537979d80cd453b3d97e