Merge "Remove the extra mapping of field types in ProtoOutputStream"