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

Change-Id: I8930043646a13fbc342b1259a3703e7b3a8b168a