Merge "Use proper logic operators in package name validation"