Merge "Add missing copyright notes." into nyc-dev