Merge "OWNERS change / new .proto file"