Merge "Remove a duplicate header"