Merge "Use hand written hasCode for ChangeIdStateQuery"

    @Override

    public int hashCode() {

        return Objects.hash(type, changeId, packageName, uid, userId);

        int result = 1;

        result = 31 * result + type;

        result = 31 * result + (int) (changeId ^ (changeId >>> 32));

        if (packageName != null) {

            result = 31 * result + packageName.hashCode();

        }

        result = 31 * result + uid;

        result = 31 * result + userId;

        return result;

    }

}