diff --git a/vizier/_src/pyvizier/oss/metadata_util.py b/vizier/_src/pyvizier/oss/metadata_util.py
index 36db3b709..81c2cc77d 100644
--- a/vizier/_src/pyvizier/oss/metadata_util.py
+++ b/vizier/_src/pyvizier/oss/metadata_util.py
@@ -18,14 +18,13 @@
 
 from typing import Dict, Iterable, Literal, Optional, Tuple, Type, TypeVar, Union
 from absl import logging
-
+from google.protobuf.message import Message
 from vizier._src.pyvizier.shared import common
 from vizier._src.pyvizier.shared import trial
 from vizier._src.service import key_value_pb2
 from vizier._src.service import study_pb2
 from vizier._src.service import vizier_service_pb2
 from google.protobuf import any_pb2
-from google.protobuf.message import Message
 
 T = TypeVar('T')
 
diff --git a/vizier/_src/pyvizier/shared/common.py b/vizier/_src/pyvizier/shared/common.py
index ac587e138..8f21494ee 100644
--- a/vizier/_src/pyvizier/shared/common.py
+++ b/vizier/_src/pyvizier/shared/common.py
@@ -18,14 +18,14 @@
 
 import collections
 from collections import abc
-from typing import DefaultDict, Dict, overload, Iterator
-from typing import Iterable, List, Optional, Tuple, TypeVar, Union, Type
+from typing import DefaultDict, Dict, Iterator, overload
+from typing import Iterable, List, Optional, Tuple, Type, TypeVar, Union
 
 from absl import logging
 import attr
+from google.protobuf.message import Message
 
 from google.protobuf import any_pb2
-from google.protobuf.message import Message
 
 _M = TypeVar('_M', bound=Message)
 T = TypeVar('T')
diff --git a/vizier/_src/service/vizier_client.py b/vizier/_src/service/vizier_client.py
index 34f796617..0eaf49b49 100644
--- a/vizier/_src/service/vizier_client.py
+++ b/vizier/_src/service/vizier_client.py
@@ -26,8 +26,8 @@
 
 from absl import logging
 import attr
+from google.protobuf import json_format
 import grpc
-
 from vizier._src.service import constants
 from vizier._src.service import resources
 from vizier._src.service import stubs_util
@@ -40,7 +40,6 @@
 
 from google.longrunning import operations_pb2
 from google.protobuf import duration_pb2
-from google.protobuf import json_format
 
 
 @attr.define