Merge "Add copyright header for new file"