diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/ImsDeregistrationReason.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/ImsDeregistrationReason.aidl
index 330374e..b04e559 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/ImsDeregistrationReason.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims/current/android/hardware/radio/ims/ImsDeregistrationReason.aidl
@@ -36,5 +36,5 @@
 enum ImsDeregistrationReason {
   REASON_SIM_REMOVED = 1,
   REASON_SIM_REFRESH = 2,
-  REASON_NETWORK_MODE_CHANGED = 3,
+  REASON_ALLOWED_NETWORK_TYPES_CHANGED = 3,
 }
diff --git a/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl b/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
index ea286c4..82773f2 100644
--- a/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
+++ b/radio/aidl/android/hardware/radio/ims/IRadioImsIndication.aidl
@@ -32,12 +32,12 @@
      * on cellular networks. IMS service shall call stopImsTraffic when receiving
      * this indication.
      *
-     * @param token The token of startImsTraffic() associated with this indication
      * @param type Type of radio indication
+     * @param token The token of startImsTraffic() associated with this indication
      * @param info Connection failure information
      */
-    void onConnectionSetupFailure(in RadioIndicationType type, in String token,
-            in ConnectionFailureInfo info);
+    void onConnectionSetupFailure(
+            in RadioIndicationType type, in String token, in ConnectionFailureInfo info);
 
     /**
      * Access Network Bitrate Recommendation (ANBR), see 3GPP TS 26.114.
@@ -49,19 +49,18 @@
      * @param bitsPerSecond The recommended bit rate for the UE
      * for a specific logical channel and a specific direction by NW
      */
-     void notifyAnbr(in RadioIndicationType type, in ImsStreamType mediaType,
+    void notifyAnbr(in RadioIndicationType type, in ImsStreamType mediaType,
             in ImsStreamDirection direction, int bitsPerSecond);
 
     /**
-     * Fired by radio when a graceful IMS deregistration needs to be performed by telephony
-     * prior to radio performing network detach. Example scenarios are SIM refresh or user
-     * mode preference change which would cause network detach. The radio waits for the
-     * IMS deregistration, which will be notified by telephony via
+     * Requests IMS stack to perform graceful IMS deregistration before radio performing
+     * network detach in the events of SIM remove, refresh or and so on. The radio waits for
+     * the IMS deregistration, which will be notified by telephony via
      * {@link IRadioIms#updateImsRegistrationInfo()}, or a certain timeout interval to start
      * the network detach procedure.
      *
      * @param type Type of radio indication
      * @param reason the reason why the deregistration is triggered
      */
-     void triggerImsDeregistration(in RadioIndicationType type, in ImsDeregistrationReason reason);
+    void triggerImsDeregistration(in RadioIndicationType type, in ImsDeregistrationReason reason);
 }
diff --git a/radio/aidl/android/hardware/radio/ims/ImsDeregistrationReason.aidl b/radio/aidl/android/hardware/radio/ims/ImsDeregistrationReason.aidl
index 83c0321..eac8db4 100644
--- a/radio/aidl/android/hardware/radio/ims/ImsDeregistrationReason.aidl
+++ b/radio/aidl/android/hardware/radio/ims/ImsDeregistrationReason.aidl
@@ -34,5 +34,5 @@
      * Radio shall send this reason to IMS stack to perform graceful de-registration
      * due to allowed network types bitmask changed that results in NAS detach.
      */
-    REASON_NETWORK_MODE_CHANGED = 3,
+    REASON_ALLOWED_NETWORK_TYPES_CHANGED = 3,
 }
diff --git a/radio/aidl/android/hardware/radio/ims/SuggestedAction.aidl b/radio/aidl/android/hardware/radio/ims/SuggestedAction.aidl
index a17b8a4..2d12ed6 100644
--- a/radio/aidl/android/hardware/radio/ims/SuggestedAction.aidl
+++ b/radio/aidl/android/hardware/radio/ims/SuggestedAction.aidl
@@ -21,17 +21,17 @@
 @Backing(type="int")
 enum SuggestedAction {
     /** Default value */
-    NONE = 0,
+    NONE,
     /**
      * Indicates that the IMS registration is failed with fatal error such as 403 or 404
      * on all P-CSCF addresses. The radio shall block the current PLMN or disable
      * the RAT as per the carrier requirements.
      */
-    TRIGGER_PLMN_BLOCK = 1 << 0,
+    TRIGGER_PLMN_BLOCK,
     /**
      * Indicates that the IMS registration on current PLMN failed multiple times.
      * The radio shall block the current PLMN or disable the RAT during EPS or 5GS mobility
      * management timer value as per the carrier requirements.
      */
-    TRIGGER_PLMN_BLOCK_WITH_TIMEOUT = 1 << 1,
+    TRIGGER_PLMN_BLOCK_WITH_TIMEOUT,
 }
diff --git a/radio/aidl/vts/radio_ims_indication.cpp b/radio/aidl/vts/radio_ims_indication.cpp
index 8e98d85..f382de0 100644
--- a/radio/aidl/vts/radio_ims_indication.cpp
+++ b/radio/aidl/vts/radio_ims_indication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/radio/aidl/vts/radio_ims_response.cpp b/radio/aidl/vts/radio_ims_response.cpp
index 62912ea..9d8db4a 100644
--- a/radio/aidl/vts/radio_ims_response.cpp
+++ b/radio/aidl/vts/radio_ims_response.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/radio/aidl/vts/radio_ims_test.cpp b/radio/aidl/vts/radio_ims_test.cpp
index 27cc8d9..e5cbeb4 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/radio/aidl/vts/radio_ims_utils.h b/radio/aidl/vts/radio_ims_utils.h
index 98fd3cb..c981ebc 100644
--- a/radio/aidl/vts/radio_ims_utils.h
+++ b/radio/aidl/vts/radio_ims_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@
     virtual ndk::ScopedAStatus updateImsRegistrationInfoResponse(
             const RadioResponseInfo& info) override;
 
-    virtual ndk::ScopedAStatus startImsTrafficResponse(const RadioResponseInfo& info,
+    virtual ndk::ScopedAStatus startImsTrafficResponse(
+            const RadioResponseInfo& info,
             const std::optional<ConnectionFailureInfo>& response) override;
 
     virtual ndk::ScopedAStatus stopImsTrafficResponse(const RadioResponseInfo& info) override;