diff --git a/connections/core_test.cc b/connections/core_test.cc
index 45f22d37..f995ab92 100644
--- a/connections/core_test.cc
+++ b/connections/core_test.cc
@@ -49,10 +49,10 @@ class FakeNearbyDevice : public NearbyDevice {
   NearbyDevice::Type GetType() const override {
     return NearbyDevice::Type::kUnknownDevice;
   }
-  MOCK_METHOD(std::string, GetEndpointId, (), (const override));
+  MOCK_METHOD(std::string, GetEndpointId, (), (const, override));
   MOCK_METHOD(std::vector<ConnectionInfoVariant>, GetConnectionInfos, (),
-              (const override));
-  MOCK_METHOD(std::string, ToProtoBytes, (), (const override));
+              (const, override));
+  MOCK_METHOD(std::string, ToProtoBytes, (), (const, override));
 };
 
 class FakeNearbyDeviceProvider : public NearbyDeviceProvider {
diff --git a/connections/implementation/base_endpoint_channel_test.cc b/connections/implementation/base_endpoint_channel_test.cc
index 00646455..c59ac361 100644
--- a/connections/implementation/base_endpoint_channel_test.cc
+++ b/connections/implementation/base_endpoint_channel_test.cc
@@ -58,7 +58,7 @@ class TestEndpointChannel : public BaseEndpointChannel {
 
   using BaseEndpointChannel::EncodeMessageForTests;
 
-  MOCK_METHOD(Medium, GetMedium, (), (const override));
+  MOCK_METHOD(Medium, GetMedium, (), (const, override));
   MOCK_METHOD(void, CloseImpl, (), (override));
 };
 
diff --git a/connections/implementation/base_pcp_handler_test.cc b/connections/implementation/base_pcp_handler_test.cc
index d2202e57..12aa3ff1 100644
--- a/connections/implementation/base_pcp_handler_test.cc
+++ b/connections/implementation/base_pcp_handler_test.cc
@@ -121,9 +121,9 @@ class FakePresenceDevice : public NearbyDevice {
  public:
   std::string GetEndpointId() const override { return "LOCALTEST"; }
   MOCK_METHOD(std::vector<ConnectionInfoVariant>, GetConnectionInfos, (),
-              (const override));
-  MOCK_METHOD(NearbyDevice::Type, GetType, (), (const override));
-  MOCK_METHOD(std::string, ToProtoBytes, (), (const override));
+              (const, override));
+  MOCK_METHOD(NearbyDevice::Type, GetType, (), (const, override));
+  MOCK_METHOD(std::string, ToProtoBytes, (), (const, override));
 };
 
 class FakePresenceDeviceProvider : public NearbyDeviceProvider {
@@ -171,13 +171,13 @@ class MockEndpointChannel : public BaseEndpointChannel {
   MOCK_METHOD(Exception, Write, (const ByteArray& data), (override));
   MOCK_METHOD(void, CloseImpl, (), (override));
   MOCK_METHOD(location::nearby::proto::connections::Medium, GetMedium, (),
-              (const override));
-  MOCK_METHOD(std::string, GetType, (), (const override));
-  MOCK_METHOD(std::string, GetName, (), (const override));
-  MOCK_METHOD(bool, IsPaused, (), (const override));
+              (const, override));
+  MOCK_METHOD(std::string, GetType, (), (const, override));
+  MOCK_METHOD(std::string, GetName, (), (const, override));
+  MOCK_METHOD(bool, IsPaused, (), (const, override));
   MOCK_METHOD(void, Pause, (), (override));
   MOCK_METHOD(void, Resume, (), (override));
-  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const override));
+  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const, override));
 
   bool broken_write_{false};
 
@@ -199,8 +199,8 @@ class MockPcpHandler : public BasePcpHandler {
   using BasePcpHandler::DiscoveredEndpoint;
   using BasePcpHandler::StartOperationResult;
 
-  MOCK_METHOD(Strategy, GetStrategy, (), (const override));
-  MOCK_METHOD(Pcp, GetPcp, (), (const override));
+  MOCK_METHOD(Strategy, GetStrategy, (), (const, override));
+  MOCK_METHOD(Pcp, GetPcp, (), (const, override));
 
   MOCK_METHOD(bool, HasOutgoingConnections, (ClientProxy * client),
               (const, override));
diff --git a/connections/implementation/connections_authentication_transport_test.cc b/connections/implementation/connections_authentication_transport_test.cc
index 84774aa5..fc5058da 100644
--- a/connections/implementation/connections_authentication_transport_test.cc
+++ b/connections/implementation/connections_authentication_transport_test.cc
@@ -51,29 +51,29 @@ class MockEndpointChannel : public EndpointChannel {
                location::nearby::analytics::proto::ConnectionsLog::
                    EstablishedConnection::SafeDisconnectionResult result),
               (override));
-  MOCK_METHOD(std::string, GetType, (), (const override));
-  MOCK_METHOD(std::string, GetServiceId, (), (const override));
-  MOCK_METHOD(std::string, GetName, (), (const override));
+  MOCK_METHOD(std::string, GetType, (), (const, override));
+  MOCK_METHOD(std::string, GetServiceId, (), (const, override));
+  MOCK_METHOD(std::string, GetName, (), (const, override));
   MOCK_METHOD(location::nearby::proto::connections::Medium, GetMedium, (),
-              (const override));
+              (const, override));
   MOCK_METHOD(location::nearby::proto::connections::ConnectionTechnology,
-              GetTechnology, (), (const override));
+              GetTechnology, (), (const, override));
   MOCK_METHOD(location::nearby::proto::connections::ConnectionBand, GetBand, (),
-              (const override));
-  MOCK_METHOD(int, GetFrequency, (), (const override));
-  MOCK_METHOD(int, GetTryCount, (), (const override));
-  MOCK_METHOD(int, GetMaxTransmitPacketSize, (), (const override));
+              (const, override));
+  MOCK_METHOD(int, GetFrequency, (), (const, override));
+  MOCK_METHOD(int, GetTryCount, (), (const, override));
+  MOCK_METHOD(int, GetMaxTransmitPacketSize, (), (const, override));
   MOCK_METHOD(void, EnableEncryption, (std::shared_ptr<EncryptionContext>),
               (override));
   MOCK_METHOD(void, DisableEncryption, (), (override));
   MOCK_METHOD(bool, IsEncrypted, (), (override));
   MOCK_METHOD(ExceptionOr<ByteArray>, TryDecrypt, (const ByteArray& data),
               (override));
-  MOCK_METHOD(bool, IsPaused, (), (const override));
+  MOCK_METHOD(bool, IsPaused, (), (const, override));
   MOCK_METHOD(void, Pause, (), (override));
   MOCK_METHOD(void, Resume, (), (override));
-  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const override));
-  MOCK_METHOD(absl::Time, GetLastWriteTimestamp, (), (const override));
+  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const, override));
+  MOCK_METHOD(absl::Time, GetLastWriteTimestamp, (), (const, override));
   MOCK_METHOD(void, SetAnalyticsRecorder,
               (analytics::AnalyticsRecorder*, const std::string&), (override));
 
diff --git a/connections/implementation/endpoint_channel_manager_test.cc b/connections/implementation/endpoint_channel_manager_test.cc
index eb0da0c2..7a1718d0 100644
--- a/connections/implementation/endpoint_channel_manager_test.cc
+++ b/connections/implementation/endpoint_channel_manager_test.cc
@@ -63,7 +63,7 @@ class MockEndpointChannel : public BaseEndpointChannel {
   explicit MockEndpointChannel(InputStream* input, OutputStream* output)
       : BaseEndpointChannel("service_id", "channel", input, output) {}
 
-  MOCK_METHOD(Medium, GetMedium, (), (const override));
+  MOCK_METHOD(Medium, GetMedium, (), (const, override));
   MOCK_METHOD(void, CloseImpl, (), (override));
 };
 
diff --git a/connections/implementation/endpoint_manager_test.cc b/connections/implementation/endpoint_manager_test.cc
index ff250735..09466d63 100644
--- a/connections/implementation/endpoint_manager_test.cc
+++ b/connections/implementation/endpoint_manager_test.cc
@@ -77,27 +77,27 @@ class MockEndpointChannel : public EndpointChannel {
                    EstablishedConnection::SafeDisconnectionResult result),
               (override));
   MOCK_METHOD(location::nearby::proto::connections::ConnectionTechnology,
-              GetTechnology, (), (const override));
+              GetTechnology, (), (const, override));
   MOCK_METHOD(location::nearby::proto::connections::ConnectionBand, GetBand, (),
-              (const override));
-  MOCK_METHOD(int, GetFrequency, (), (const override));
-  MOCK_METHOD(int, GetTryCount, (), (const override));
-  MOCK_METHOD(std::string, GetType, (), (const override));
-  MOCK_METHOD(std::string, GetServiceId, (), (const override));
-  MOCK_METHOD(std::string, GetName, (), (const override));
-  MOCK_METHOD(Medium, GetMedium, (), (const override));
-  MOCK_METHOD(int, GetMaxTransmitPacketSize, (), (const override));
+              (const, override));
+  MOCK_METHOD(int, GetFrequency, (), (const, override));
+  MOCK_METHOD(int, GetTryCount, (), (const, override));
+  MOCK_METHOD(std::string, GetType, (), (const, override));
+  MOCK_METHOD(std::string, GetServiceId, (), (const, override));
+  MOCK_METHOD(std::string, GetName, (), (const, override));
+  MOCK_METHOD(Medium, GetMedium, (), (const, override));
+  MOCK_METHOD(int, GetMaxTransmitPacketSize, (), (const, override));
   MOCK_METHOD(void, EnableEncryption,
               (std::shared_ptr<EncryptionContext> context), (override));
   MOCK_METHOD(void, DisableEncryption, (), (override));
-  MOCK_METHOD(bool, IsPaused, (), (const override));
+  MOCK_METHOD(bool, IsPaused, (), (const, override));
   MOCK_METHOD(bool, IsEncrypted, (), (override));
   MOCK_METHOD(ExceptionOr<ByteArray>, TryDecrypt, (const ByteArray& data),
               (override));
   MOCK_METHOD(void, Pause, (), (override));
   MOCK_METHOD(void, Resume, (), (override));
-  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const override));
-  MOCK_METHOD(absl::Time, GetLastWriteTimestamp, (), (const override));
+  MOCK_METHOD(absl::Time, GetLastReadTimestamp, (), (const, override));
+  MOCK_METHOD(absl::Time, GetLastWriteTimestamp, (), (const, override));
   MOCK_METHOD(void, SetAnalyticsRecorder,
               (analytics::AnalyticsRecorder*, const std::string&), (override));
 
diff --git a/connections/implementation/mock_device.h b/connections/implementation/mock_device.h
index a764df9a..b7cd733b 100644
--- a/connections/implementation/mock_device.h
+++ b/connections/implementation/mock_device.h
@@ -25,11 +25,11 @@ namespace nearby {
 
 class MockNearbyDevice : public NearbyDevice {
  public:
-  MOCK_METHOD(NearbyDevice::Type, GetType, (), (const override));
-  MOCK_METHOD(std::string, GetEndpointId, (), (const override));
+  MOCK_METHOD(NearbyDevice::Type, GetType, (), (const, override));
+  MOCK_METHOD(std::string, GetEndpointId, (), (const, override));
   MOCK_METHOD(std::vector<ConnectionInfoVariant>, GetConnectionInfos, (),
-              (const override));
-  MOCK_METHOD(std::string, ToProtoBytes, (), (const override));
+              (const, override));
+  MOCK_METHOD(std::string, ToProtoBytes, (), (const, override));
 };
 
 }  // namespace nearby
diff --git a/connections/implementation/service_controller_router_test.cc b/connections/implementation/service_controller_router_test.cc
index e6926544..7d8599ba 100644
--- a/connections/implementation/service_controller_router_test.cc
+++ b/connections/implementation/service_controller_router_test.cc
@@ -59,10 +59,10 @@ class FakeNearbyDevice : public NearbyDevice {
   NearbyDevice::Type GetType() const override {
     return NearbyDevice::Type::kUnknownDevice;
   }
-  MOCK_METHOD(std::string, GetEndpointId, (), (const override));
+  MOCK_METHOD(std::string, GetEndpointId, (), (const, override));
   MOCK_METHOD(std::vector<ConnectionInfoVariant>, GetConnectionInfos, (),
-              (const override));
-  MOCK_METHOD(std::string, ToProtoBytes, (), (const override));
+              (const, override));
+  MOCK_METHOD(std::string, ToProtoBytes, (), (const, override));
 };
 
 // This class must be in the same namespace as ServiceControllerRouter for
diff --git a/connections/v3/connections_device_provider_test.cc b/connections/v3/connections_device_provider_test.cc
index 408435ce..510a2881 100644
--- a/connections/v3/connections_device_provider_test.cc
+++ b/connections/v3/connections_device_provider_test.cc
@@ -27,8 +27,8 @@ constexpr absl::string_view kEndpointId = "ABCD";
 constexpr absl::string_view kEndpointInfo = "NC endpoint";
 
 class MockAuthenticationTransport : public AuthenticationTransport {
-  MOCK_METHOD(void, WriteMessage, (absl::string_view), (const override));
-  MOCK_METHOD(std::string, ReadMessage, (), (const override));
+  MOCK_METHOD(void, WriteMessage, (absl::string_view), (const, override));
+  MOCK_METHOD(std::string, ReadMessage, (), (const, override));
 };
 
 TEST(ConnectionsDeviceProviderTest, TestProviderWorksTwoArgs) {
diff --git a/presence/implementation/mock_connection_authenticator.h b/presence/implementation/mock_connection_authenticator.h
index 5b646c80..24e860eb 100644
--- a/presence/implementation/mock_connection_authenticator.h
+++ b/presence/implementation/mock_connection_authenticator.h
@@ -39,22 +39,22 @@ class MockConnectionAuthenticator : public ConnectionAuthenticator {
               (absl::string_view ukey2_secret,
                std::optional<const internal::LocalCredential> local_credential,
                const internal::SharedCredential& shared_credential),
-              (const override));
+              (const, override));
   MOCK_METHOD(absl::StatusOr<ResponderData>, BuildSignedMessageAsResponder,
               (absl::string_view ukey2_secret,
                const internal::LocalCredential& local_credential),
-              (const override));
+              (const, override));
   MOCK_METHOD(
       absl::Status, VerifyMessageAsInitiator,
       (ResponderData authentication_data, absl::string_view ukey2_secret,
        const std::vector<internal::SharedCredential>& shared_credentials),
-      (const override));
+      (const, override));
   MOCK_METHOD(
       absl::StatusOr<internal::LocalCredential>, VerifyMessageAsResponder,
       (absl::string_view ukey2_secret, InitiatorData initiator_data,
        const std::vector<internal::LocalCredential>& local_credentials,
        const std::vector<internal::SharedCredential>& shared_credentials),
-      (const override));
+      (const, override));
 };
 
 }  // namespace presence
diff --git a/presence/presence_device_provider_test.cc b/presence/presence_device_provider_test.cc
index 0ef21849..a8985270 100644
--- a/presence/presence_device_provider_test.cc
+++ b/presence/presence_device_provider_test.cc
@@ -102,8 +102,8 @@ ConnectionAuthenticator::TwoWayInitiatorData BuildDefaultInitiatorData() {
 
 class MockAuthenticationTransport : public AuthenticationTransport {
  public:
-  MOCK_METHOD(void, WriteMessage, (absl::string_view), (const override));
-  MOCK_METHOD(std::string, ReadMessage, (), (const override));
+  MOCK_METHOD(void, WriteMessage, (absl::string_view), (const, override));
+  MOCK_METHOD(std::string, ReadMessage, (), (const, override));
 };
 
 class PresenceDeviceProviderTest : public ::testing::Test {
diff --git a/sharing/fake_nearby_connections_service.h b/sharing/fake_nearby_connections_service.h
index 35084f3f..a5a78012 100644
--- a/sharing/fake_nearby_connections_service.h
+++ b/sharing/fake_nearby_connections_service.h
@@ -110,7 +110,7 @@ class FakeNearbyConnectionsService : public NearbyConnectionsService {
                std::function<void(Status status)> callback),
               (override));
 
-  MOCK_METHOD(std::string, Dump, (), (const override));
+  MOCK_METHOD(std::string, Dump, (), (const, override));
 };
 
 }  // namespace sharing