Merge "Fix String.equals() for moveable String.class."
am: 972e654c14

Change-Id: Ic46ce700f7b8d7bca201a9032d5068bf6aeea06e