Merge "Fix DisabledAlgorithmConstraints whitespace and copyright header."