Merge "Revert "Revert "Fixed Literal String intern mismatch.""" am: 0656044bf8 am: 776afa9c43
am: bb470ab34c

Change-Id: I6f1b0dd4068345d7e08db6823fe35aa5735b70b9