Merge "Remove token check from equalsExceptToken" into udc-qpr-dev