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

Change-Id: Ia9a589ecb6363835bcd1aa02cb0e87f88b693f56