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

Change-Id: I58c5e47c918cc3c1cdad30d563964e70ca5c5261