Merge "Add correct copyright headers to multiple files"