Merge "Fixed Literal String intern mismatch."
am: 854461a4cd

Change-Id: I0f9f8cce884848b8c74f3c1fd43e27a0276a3f02