Merge "Fixed Literal String intern mismatch." am: 854461a4cd am: 1ae24b378a
am: 6a4bbdf4c9

Change-Id: I14f95c0c05e6cb5bd4e9817096ea86da15be0fb7