Merge "Remove some duplication of validation logic"