Merge "Fix H404/405 violations for common code"