Merge "Remove @author tags from copyright statements"