Merge "Fix proto file paths"