Merge "Remove redundant checks in CompatChangeRule"