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

Change-Id: Ie814f3a6aebd2b94c2c8e3732a04a2c0df45dfbd