Merge "Fix serializing dynamic references to proto"