diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
index c327d9f..5dc0c7f 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -3005,6 +3005,7 @@
  * Verifies that AES GCM mode works when provided additional authenticated data in multiple chunks.
  */
 TEST_F(EncryptionOperationsTest, AesGcmMultiPartAad) {
+    const size_t tag_bits = 128;
     ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
                                              .Authorization(TAG_NO_AUTH_REQUIRED)
                                              .AesEncryptionKey(128)
@@ -3016,7 +3017,7 @@
     auto begin_params = AuthorizationSetBuilder()
                             .BlockMode(BlockMode::GCM)
                             .Padding(PaddingMode::NONE)
-                            .Authorization(TAG_MAC_LENGTH, 128);
+                            .Authorization(TAG_MAC_LENGTH, tag_bits);
     AuthorizationSet begin_out_params;
 
     auto update_params =
@@ -3038,10 +3039,11 @@
     EXPECT_EQ(ErrorCode::OK, Update(op_handle_, update_params, message, &update_out_params,
                                     &ciphertext, &input_consumed));
     EXPECT_EQ(message.size(), input_consumed);
-    EXPECT_EQ(message.size(), ciphertext.size());
     EXPECT_TRUE(update_out_params.empty());
 
     EXPECT_EQ(ErrorCode::OK, Finish("" /* input */, &ciphertext));
+    // Expect 128-bit (16-byte) tag appended to ciphertext.
+    EXPECT_EQ(message.size() + (tag_bits >> 3), ciphertext.size());
 
     // Grab nonce.
     begin_params.push_back(begin_out_params);
@@ -3097,7 +3099,6 @@
     EXPECT_EQ(ErrorCode::OK, Update(op_handle_, update_params, message, &update_out_params,
                                     &ciphertext, &input_consumed));
     EXPECT_EQ(message.size(), input_consumed);
-    EXPECT_EQ(message.size(), ciphertext.size());
     EXPECT_TRUE(update_out_params.empty());
 
     // More AAD
diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp
index b959670..afbb1c4 100644
--- a/radio/1.0/vts/functional/Android.bp
+++ b/radio/1.0/vts/functional/Android.bp
@@ -31,8 +31,6 @@
            "VtsHalRadioV1_0TargetTest.cpp",
            "vts_test_util.cpp"],
     static_libs: [
-        "android.hardware.radio@1.2",
-        "android.hardware.radio@1.1",
         "android.hardware.radio@1.0",
     ],
 }
@@ -46,8 +44,6 @@
            "VtsHalSapV1_0TargetTest.cpp",
            "vts_test_util.cpp"],
     static_libs: [
-        "android.hardware.radio@1.2",
-        "android.hardware.radio@1.1",
         "android.hardware.radio@1.0",
     ],
 }
@@ -59,8 +55,6 @@
         "vts_test_util.cpp"
     ],
     shared_libs: [
-        "android.hardware.radio@1.2",
-        "android.hardware.radio@1.1",
         "android.hardware.radio@1.0",
     ],
 }
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index 5a5813d..bc03cf1 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -36,19 +36,15 @@
  * Test IRadio.getVoiceRegistrationState() for the response returned.
  */
 TEST_F(RadioHidlTest, getVoiceRegistrationState) {
-    // The IRadio/IRadioResponse pair of this function is upgraded in 1.2.
-    // For radio version < 1.2, skip to test this function.
-    if (versionIRadio < v1_2) {
-        serial = GetRandomSerialNumber();
+    serial = GetRandomSerialNumber();
 
-        radio->getVoiceRegistrationState(serial);
-        EXPECT_EQ(std::cv_status::no_timeout, wait());
-        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-        EXPECT_EQ(serial, radioRsp->rspInfo.serial);
+    radio->getVoiceRegistrationState(serial);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
+    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+    EXPECT_EQ(serial, radioRsp->rspInfo.serial);
 
-        if (cardStatus.cardState == CardState::ABSENT) {
-            EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
-        }
+    if (cardStatus.cardState == CardState::ABSENT) {
+        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
     }
 }
 
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
index fec66ca..96719d6 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
@@ -25,10 +25,6 @@
             RadioHidlEnvironment::Instance()->getServiceName<IRadio>(
                 hidl_string(RADIO_SERVICE_NAME)));
     }
-
-    versionIRadio = getIRadioVersion(radio);
-    ASSERT_FALSE(unknown == versionIRadio);
-
     ASSERT_NE(nullptr, radio.get());
 
     radioRsp = new (std::nothrow) RadioResponse(*this);
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
index edbeb7a..f5ce072 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
+++ b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
@@ -33,7 +33,6 @@
 
 using ::android::hardware::hidl_string;
 using ::android::hardware::hidl_vec;
-using ::android::hardware::hidl_version;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::sp;
@@ -537,9 +536,6 @@
     /* Serial number for radio request */
     int serial;
 
-    /* Version of radio service */
-    hidl_version versionIRadio{0, 0};
-
     /* Update Sim Card Status */
     void updateSimCardStatus();
 
diff --git a/radio/1.0/vts/functional/vts_test_util.cpp b/radio/1.0/vts/functional/vts_test_util.cpp
index 20ec99e..7d15f35 100644
--- a/radio/1.0/vts/functional/vts_test_util.cpp
+++ b/radio/1.0/vts/functional/vts_test_util.cpp
@@ -54,21 +54,3 @@
     }
     return testing::AssertionFailure() << "SapError:" + toString(err) + " is returned";
 }
-
-hidl_version getIRadioVersion(sp<::android::hardware::radio::V1_0::IRadio> radio) {
-    if (::android::hardware::radio::V1_2::IRadio::castFrom(radio).withDefault(nullptr) != nullptr) {
-        ALOGI("Radio service version: 1.2");
-        return v1_2;
-    } else if (::android::hardware::radio::V1_1::IRadio::castFrom(radio).withDefault(nullptr) !=
-               nullptr) {
-        ALOGI("Radio service version: 1.1");
-        return v1_1;
-    } else if (::android::hardware::radio::V1_0::IRadio::castFrom(radio).withDefault(nullptr) !=
-               nullptr) {
-        ALOGI("Radio service version: 1.0");
-        return v1_0;
-    } else {
-        ALOGI("Radio service version: unknown");
-        return unknown;
-    }
-}
\ No newline at end of file
diff --git a/radio/1.0/vts/functional/vts_test_util.h b/radio/1.0/vts/functional/vts_test_util.h
index 36ca18f..826f0de 100644
--- a/radio/1.0/vts/functional/vts_test_util.h
+++ b/radio/1.0/vts/functional/vts_test_util.h
@@ -14,20 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef VTS_TEST_UTIL_H
-#define VTS_TEST_UTIL_H 1
-
 #include <android-base/logging.h>
 
 #include <VtsHalHidlTargetTestBase.h>
 
-#include <android/hardware/radio/1.0/IRadio.h>
 #include <android/hardware/radio/1.0/types.h>
-#include <android/hardware/radio/1.1/IRadio.h>
-#include <android/hardware/radio/1.2/IRadio.h>
 
-using ::android::sp;
-using ::android::hardware::hidl_version;
 using ::android::hardware::radio::V1_0::RadioError;
 using ::android::hardware::radio::V1_0::SapResultCode;
 using namespace std;
@@ -41,14 +33,6 @@
 };
 
 /*
- * Radio hidl version parameters.
- */
-const hidl_version v1_0(1, 0);
-const hidl_version v1_1(1, 1);
-const hidl_version v1_2(1, 2);
-const hidl_version unknown(0, 0);
-
-/*
  * Generate random serial number for radio test
  */
 int GetRandomSerialNumber();
@@ -64,10 +48,3 @@
  * vendor/devices implementations.
  */
 ::testing::AssertionResult CheckAnyOfErrors(SapResultCode err, std::vector<SapResultCode> errors);
-
-/*
- * Get the radio service version.
- */
-hidl_version getIRadioVersion(sp<::android::hardware::radio::V1_0::IRadio> radio);
-
-#endif /*VTS_TEST_UTIL_H*/
\ No newline at end of file
diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp
index 9d35796..e7195ee 100644
--- a/radio/1.1/vts/functional/Android.bp
+++ b/radio/1.1/vts/functional/Android.bp
@@ -24,7 +24,6 @@
            "VtsHalRadioV1_1TargetTest.cpp"],
     static_libs: [
         "RadioVtsTestUtilBase",
-        "android.hardware.radio@1.2",
         "android.hardware.radio@1.1",
         "android.hardware.radio@1.0",
     ],
diff --git a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp
index cc6b0e5..2f657b4 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp
@@ -30,10 +30,6 @@
                 ->getServiceName<::android::hardware::radio::V1_1::IRadio>(
                     hidl_string(RADIO_SERVICE_NAME)));
     }
-
-    versionIRadio = getIRadioVersion(radio_v1_1);
-    ASSERT_FALSE(unknown == versionIRadio);
-
     ASSERT_NE(nullptr, radio_v1_1.get());
 
     radioRsp_v1_1 = new (std::nothrow) RadioResponse_v1_1(*this);
diff --git a/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h b/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h
index 6125442..925f4fc 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h
+++ b/radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h
@@ -561,9 +561,6 @@
     /* Serial number for radio request */
     int serial;
 
-    /* Version of radio service */
-    hidl_version versionIRadio{0, 0};
-
     /* Update Sim Card Status */
     void updateSimCardStatus();
 
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
index 7a34d11..b34f138 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp
@@ -30,10 +30,6 @@
                 ->getServiceName<::android::hardware::radio::V1_2::IRadio>(
                     hidl_string(RADIO_SERVICE_NAME)));
     }
-
-    versionIRadio = getIRadioVersion(radio_v1_2);
-    ASSERT_FALSE(unknown == versionIRadio);
-
     ASSERT_NE(nullptr, radio_v1_2.get());
 
     radioRsp_v1_2 = new (std::nothrow) RadioResponse_v1_2(*this);
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
index 06be67c..4712202 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
+++ b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h
@@ -616,9 +616,6 @@
     /* Serial number for radio request */
     int serial;
 
-    /* Version of radio service */
-    hidl_version versionIRadio{0, 0};
-
     /* Update Sim Card Status */
     void updateSimCardStatus();
 
diff --git a/radio/config/1.0/vts/functional/Android.bp b/radio/config/1.0/vts/functional/Android.bp
index a1243a6..aa8266e 100644
--- a/radio/config/1.0/vts/functional/Android.bp
+++ b/radio/config/1.0/vts/functional/Android.bp
@@ -27,9 +27,6 @@
     static_libs: [
         "RadioVtsTestUtilBase",
         "android.hardware.radio.config@1.0",
-        "android.hardware.radio@1.2",
-        "android.hardware.radio@1.1",
-        "android.hardware.radio@1.0",
     ],
     header_libs: ["radio.util.header@1.0"],
 }