Merge "Revert "Fix String.equals() for moveable String.class.""