Merge "Minor copyright header unification."