diff --git a/.config/cache-config.env b/.config/cache-config.env
index 774a4628b40..fa6b2be0b50 100644
--- a/.config/cache-config.env
+++ b/.config/cache-config.env
@@ -1,3 +1,3 @@
-CACHE_VERSION=v1
+CACHE_VERSION=v2
 BAZEL_REMOTE_CACHE="https://storage.googleapis.com/android-cuttlefish-cache"
 
diff --git a/.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script/action.yaml b/.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script/action.yaml
index f31c36df9a1..83c81bf2419 100644
--- a/.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script/action.yaml
+++ b/.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script/action.yaml
@@ -23,7 +23,6 @@ runs:
       apt-get install -y lsb-release
       apt-get install -y pciutils
       apt-get install -y apt-show-versions
-      apt-get install -y linux-image-arm64 linux-headers-arm64
   - name: Setup base and non-free repository
     shell: bash
     run: |
diff --git a/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml b/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml
index 8e52f6694db..32ef8127919 100644
--- a/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml
+++ b/.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml
@@ -56,7 +56,7 @@ jobs:
         nvidia_gpu: ["true", "false"]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Check preseed after install script
       uses: ./.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script
       with:
@@ -72,11 +72,11 @@ jobs:
       image: debian@sha256:13f29b6806e531c3ff3b565bb6eed73f2132506c8c9d41bb996065ca20fb27f2 # debian:trixie-20260223 (amd64)
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Build iso installer
       uses: ./.github/actions/build-gigabyte-ampere-cuttlefish-installer
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
         path: gigabyte-ampere-cuttlefish-installer/preseed-mini.iso.xz
@@ -93,9 +93,9 @@ jobs:
       TEST_DISK_SIZE: "10G"
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -137,9 +137,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -185,9 +185,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -233,9 +233,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -281,9 +281,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -301,6 +301,9 @@ jobs:
       run: |
         screen -d -m -L -Logfile console_001.log ./installer-iso-run-qemu.sh
         while ! egrep "[^[:space:]]+[[:space:]]login:" console_001.log; do sleep 30; done
+        # The login prompt appears before the system is usable, so wait for the
+        # boot to complete. "degraded" means booted with some unit failed.
+        until sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -o "ConnectTimeout 60" -p 33322 vsoc-01@localhost 'systemctl is-system-running | grep -qE "running|degraded"'; do sleep 30; done
         cp -f console_001.log console_001_p1.log
         CONSOLELINES=$(cat console_001_p1.log | wc -l)
         cat console_001_p1.log
@@ -361,9 +364,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -381,6 +384,9 @@ jobs:
       run: |
         screen -d -m -L -Logfile console_001.log ./installer-iso-run-qemu.sh
         while ! egrep "[^[:space:]]+[[:space:]]login:" console_001.log; do sleep 30; done
+        # The login prompt appears before the system is usable, so wait for the
+        # boot to complete. "degraded" means booted with some unit failed.
+        until sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -o "ConnectTimeout 60" -p 33322 vsoc-01@localhost 'systemctl is-system-running | grep -qE "running|degraded"'; do sleep 30; done
         cp -f console_001.log console_001_p1.log
         CONSOLELINES=$(cat console_001_p1.log | wc -l)
         cat console_001_p1.log
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_vm_configs.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_vm_configs.cpp
index 181707a67ff..83e85a40ecd 100644
--- a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_vm_configs.cpp
+++ b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_vm_configs.cpp
@@ -49,6 +49,7 @@ inline constexpr char kFlagEnableSandbox[] = "enable_sandbox";
 inline constexpr char kFlagCrosvmSimpleMediaDevice[] =
     "crosvm_simple_media_device";
 inline constexpr char kFlagCrosvmV4l2Proxy[] = "crosvm_v4l2_proxy";
+inline constexpr char kFlagVhostUserVsock[] = "vhost_user_vsock";
 inline constexpr char kFlagEnablePkvm[] = "enable_pkvm";
 
 std::set<std::string> GatherFlagNamesUsedInInstanceConfig(const Instance& ins) {
@@ -83,6 +84,10 @@ std::set<std::string> GatherFlagNamesUsedInInstanceConfig(const Instance& ins) {
       ins.vm().crosvm().has_v4l2_proxy()) {
     names.insert(kFlagCrosvmV4l2Proxy);
   }
+  if (ins.vm().vmm_case() == Vm::VmmCase::kCrosvm &&
+      ins.vm().crosvm().has_vhost_user_vsock()) {
+    names.insert(kFlagVhostUserVsock);
+  }
   if (ins.vm().has_enable_pkvm()) {
     names.insert(kFlagEnablePkvm);
   }
@@ -179,6 +184,13 @@ static std::string V4l2Proxy(const Instance& instance) {
   return crosvm.has_v4l2_proxy() ? crosvm.v4l2_proxy() : default_val;
 }
 
+static std::string VhostUserVsock(const Instance& instance) {
+  const auto& crosvm = instance.vm().crosvm();
+  const auto& default_val = CF_DEFAULTS_VHOST_USER_VSOCK;
+  return crosvm.has_vhost_user_vsock() ? crosvm.vhost_user_vsock()
+                                       : default_val;
+}
+
 static bool EnablePkvm(const Instance& instance) {
   const auto& vm = instance.vm();
   return vm.has_enable_pkvm() ? vm.enable_pkvm() : CF_DEFAULTS_ENABLE_PKVM;
@@ -269,6 +281,10 @@ Result<std::vector<std::string>> GenerateVmFlags(
     flags.emplace_back(
         GenerateInstanceFlag(kFlagCrosvmV4l2Proxy, cfg, V4l2Proxy));
   }
+  if (used_names.contains(kFlagVhostUserVsock)) {
+    flags.emplace_back(
+        GenerateInstanceFlag(kFlagVhostUserVsock, cfg, VhostUserVsock));
+  }
   if (used_names.contains(kFlagEnablePkvm)) {
     flags.emplace_back(GenerateInstanceFlag(kFlagEnablePkvm, cfg, EnablePkvm));
   }
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc
index 9401a4bde5d..6d90077e89d 100644
--- a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc
+++ b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc
@@ -743,4 +743,71 @@ TEST(VmFlagsParserTest, ParseTwoInstancesCustomActionsFlagPartialJson) {
   EXPECT_THAT(ParseJson(custom_actions[0]), IsOkAndValue(expected_actions));
 }
 
+TEST(VmFlagsParserTest, ParseTwoInstancesVhostUserVsockFlagPartialJson) {
+  const char* test_string = R""""(
+{
+    "instances" :
+    [
+        {
+            "vm": {
+                "crosvm":{
+                }
+            }
+        },
+        {
+            "vm": {
+                "crosvm":{
+                    "vhost_user_vsock": "true"
+                }
+            }
+        }
+    ]
+}
+  )"""";
+
+  Json::Value json_configs;
+  std::string json_text(test_string);
+
+  EXPECT_TRUE(ParseJsonString(json_text, json_configs))
+      << "Invalid Json string";
+  auto serialized_data = LaunchCvdParserTester(json_configs);
+  EXPECT_TRUE(serialized_data.ok()) << serialized_data.error().Trace();
+  EXPECT_TRUE(FindConfig(*serialized_data, R"(--vhost_user_vsock=auto,true)"))
+      << "vhost_user_vsock flag is missing or wrongly formatted";
+}
+
+TEST(VmFlagsParserTest, ParseTwoInstancesVhostUserVsockFlagFullJson) {
+  const char* test_string = R""""(
+{
+    "instances" :
+    [
+        {
+            "vm": {
+                "crosvm":{
+                    "vhost_user_vsock": "true"
+                }
+            }
+        },
+        {
+            "vm": {
+                "crosvm":{
+                    "vhost_user_vsock": "false"
+                }
+            }
+        }
+    ]
+}
+  )"""";
+
+  Json::Value json_configs;
+  std::string json_text(test_string);
+
+  EXPECT_TRUE(ParseJsonString(json_text, json_configs))
+      << "Invalid Json string";
+  auto serialized_data = LaunchCvdParserTester(json_configs);
+  EXPECT_TRUE(serialized_data.ok()) << serialized_data.error().Trace();
+  EXPECT_TRUE(FindConfig(*serialized_data, R"(--vhost_user_vsock=true,false)"))
+      << "vhost_user_vsock flag is missing or wrongly formatted";
+}
+
 }  // namespace cuttlefish
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto
index a9177160a87..c80696c2b72 100644
--- a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto
+++ b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto
@@ -199,6 +199,7 @@ message Crosvm {
   optional bool enable_sandbox = 1;
   optional bool simple_media_device = 2;
   optional string v4l2_proxy = 3;
+  optional string vhost_user_vsock = 4;
 }
 
 message Gem5 {}
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0.xml b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0.xml
index 655c37a967a..25ad8495b39 100755
--- a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0.xml
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0.xml
@@ -177,5 +177,9 @@
         <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D05E8103012181820281028D5308004F00540041529F80FD53EF5229752877ED4FE1606F901A9053FF0C5E2E52A95BA262375B9E73B0005500530049004D536151854E1A52A183DC5355768452A860014E0B8F7D3001522096644E0E66F465B0"></DISPLAYTEXT>
     </SELECTITEM>
 </SETUPMENU>
-
+<!-- Grouped Card Metadata -->
+<CardProfile>
+    <ATR>3F979580BFFE8210428031A073BE211797</ATR>
+    <EID>89049032000001000000000254806852</EID>
+</CardProfile>
 </IccProfile>
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml
index b4363da9308..1b65eb621a4 100755
--- a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml
@@ -203,5 +203,9 @@
         <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D05E8103012181820281028D5308004F00540041529F80FD53EF5229752877ED4FE1606F901A9053FF0C5E2E52A95BA262375B9E73B0005500530049004D536151854E1A52A183DC5355768452A860014E0B8F7D3001522096644E0E66F465B0"></DISPLAYTEXT>
     </SELECTITEM>
 </SETUPMENU>
-
+<!-- Grouped Card Metadata -->
+<CardProfile>
+    <ATR>3F979580BFFE8210428031A073BE211797</ATR>
+    <EID>89049032000001000000000254806852</EID>
+</CardProfile>
 </IccProfile>
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1.xml b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1.xml
new file mode 100755
index 00000000000..f1f77b54035
--- /dev/null
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1.xml
@@ -0,0 +1,185 @@
+<IccProfile>
+<MF path="3F00">
+    <EF name="EF_DIR" id="2F00" structure="linear fixed">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A8205422100300483022F008A01058B032F0601800200C08801F0</SIMIO>
+        <SIMIO cmd="B2" p1="1" p2="4" p3="30" data="">144,0,61184F10A0000003431002FF86FF0389FFFFFFFF50044353494DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="2" p2="4" p3="30" data="">144,0,61184F10A0000000871002FF86FF0389FFFFFFFF50045553494DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="3" p2="4" p3="30" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="4" p2="4" p3="30" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+    </EF>
+    <EF name="EF_ICCID" id="2FE2" structure="transparent">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183022FE28A01058B032F06038002000A880110</SIMIO>
+        <SIMIO cmd="B0" p1="0" p2="0" p3="A" data="">144,0,98683081462002318389</SIMIO>
+        <!-- Special ATC to read ICCID from modem cache -->
+        <CCID>89860318640220133898</CCID>
+    </EF>
+    <EF name="EF_PL" id="2F05" structure="transparent">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183022F058A01058B032F060280020004880128</SIMIO>
+        <SIMIO cmd="B0" p1="0" p2="0" p3="4" data="">144,0,FFFFFFFF</SIMIO>
+    </EF>
+
+    <DF name="TELECOM" path="7F10">
+        <DF name="PHONEBOOK" path="5F3A">
+            <EF name="EF_PBR" id="4F30" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62198205422100400283024F308A01058B036F0606800200808800</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="40" data="">144,0,A81EC0034F3A01C1034F3306C5034F0902C4034F1104C6034F2503C9034F3107A905CA034F5008AA0FC2034F4A09C7034F4B0AC8034F4C0BFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="40" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_GAS" id="4F4C" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A8205422100140A83024F4C8A01058B036F060E800200C8880158</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="3" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="4" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="5" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="6" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="7" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="8" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="9" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="A" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_ADN" id="4F3A" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A82054221001C1483024F3A8A01058B036F060E80020230880108</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="3" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="4" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="5" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="6" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="7" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="8" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="9" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="A" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="B" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="C" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="D" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="E" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="F" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="10" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="11" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="12" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="13" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="14" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_IAP" id="4F33" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A820542210001FA83024F338A01058B036F060E800200FA880130</SIMIO>
+            </EF>
+            <EF name="EF_PBC" id="4F09" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A820542210002FA83024F098A01058B036F060E800201F4880110</SIMIO>
+            </EF>
+            <EF name="EF_ANR" id="4F11" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A82054221000FFA83024F118A01058B036F060E80020EA6880120</SIMIO>
+            </EF>
+            <!-- EF_SNE, EF_AAS, EF_EXT1, EF_GRP, EF_UID, EF_EMAIL, EF_CCP1, EF_PUR1 ... -->
+        </DF>
+    </DF>
+
+    <ADF name="USIM" path="7FFF" aid="A0000000871002FF86FF0389FFFFFFFF">
+        <EF name="EF_IMSI" id="6F07" structure="transparent">
+            <CIMI>311740123456790</CIMI>
+        </EF>
+        <EF name="EF_MSISDN" id="6F40" structure="linear fixed">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621982054221001C0283026F408A01058B036F0605800200388800</SIMIO>
+            <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,000000000000000000000000000007915155214365F7FFFFFFFFFFFF</SIMIO>
+        </EF>
+        <EF name="EF_MBI" id="6FC9" structure="linear fixed">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62198205422100050183026FC98A01058B036F0602800200058800</SIMIO>
+            <SIMIO cmd="B2" p1="1" p2="4" p3="5" data="">144,0,0100000000</SIMIO>
+       </EF>
+        <EF name="EF_MBDN" id="6FC7" structure="linear fixed">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621982054221001C0283026F408A01058B036F06058002003E8800</SIMIO>
+            <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF07915155674523F1FFFFFFFFFFFF</SIMIO>
+       </EF>
+       <EF name="EF_AD" id="6FAD" structure="transparent">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183026FAD8A01058B036F060180020004880118</SIMIO>
+            <SIMIO cmd="B0" p1="0" p2="0" p3="4" data="">144,0,00000003</SIMIO>
+       </EF>
+       <EF name="EF_MWIS" id="6FCA" structure="linear fixed">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62198205422100050183026FCA8A01058B036F060E800200058800</SIMIO>
+           <SIMIO cmd="B2" p1="1" p2="4" p3="5" data="">144,0,0000000000</SIMIO>
+       </EF>
+       <EF name="EF_VOICE_MAIL_INDICATOR_CPHS" id="6F11" structure="transparent">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">106,130</SIMIO>
+       </EF>
+       <EF name="EF_FPLMN" id="6F7B" structure="transparent">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621C8202412183026F7BA5038001718A01058B036F06038002001E880168</SIMIO>
+           <SIMIO cmd="B0" p1="0" p2="0" p3="1E" data="">144,0,64F00064F02064F04064F07064F080FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+       </EF>
+       <EF name="EF_FDN" id="6F3B" structure="linear fixed">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621982054221001C0A83026F3B8A01058B036F0605800201188800</SIMIO>
+           <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="2" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="3" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="4" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="5" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="6" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="7" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="8" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="9" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="A" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+       </EF>
+       <!-- Other USIM files... -->
+     </ADF>
+</MF>
+
+<ADF name="PKCS15" aid="A000000063504B43532D3135">
+    <CGLA cmd="A40004025031">4,6124</CGLA>
+    <CGLA cmd="C0000024">76,62228202412183025031A503C001408A01058B066F0601010001800200108102002288009000 </CGLA>
+    <CGLA cmd="B0000010">36,A706300404024401A5063004040244029000</CGLA>
+</ADF>
+
+<ADF name="" aid="">
+    <CSIM cmd='10,"0070000001"'>6,019000</CSIM>
+    <CGLA cmd='1,14,"81F2FF0000"'>4,6b00</CGLA>
+    <!-- more CGLA Command -->
+</ADF>
+
+<PinProfile>
+    <!-- PIN: PINSTATE_ENABLED_NOT_VERIFIED -->
+    <!-- PUK: PINSTATE_ENABLED_BLOCKED -->
+    <!-- Ready: PINSTATE_UNKNOWN -->
+    <PINSTATE>PINSTATE_UNKNOWN</PINSTATE>
+    <PINCODE>1234</PINCODE>
+    <PUKCODE>12345678</PUKCODE>
+    <PINREMAINTIMES>3</PINREMAINTIMES>
+    <PUKREMAINTIMES>10</PUKREMAINTIMES>
+    <PIN2CODE>1234</PIN2CODE>
+    <PUK2CODE>12345678</PUK2CODE>
+    <PIN2REMAINTIMES>3</PIN2REMAINTIMES>
+    <PUK2REMAINTIMES>10</PUK2REMAINTIMES>
+</PinProfile>
+
+<FacilityLock>
+    <SC>DISABLE</SC>
+    <FD>DISABLE</FD>
+    <AO>DISABLE</AO>
+    <OI>DISABLE</OI>
+    <AI>DISABLE</AI>
+    <IR>DISABLE</IR>
+    <AB>DISABLE</AB>
+    <AG>DISABLE</AG>
+    <AC>DISABLE</AC>
+</FacilityLock>
+
+<SETUPMENU cmd="25" text="D0388103012500820281820509804E2D56FD79FB52A88F10508000530049004D5FEB6377786E8BA48F104E80005500530049004D53614FE1606F">
+    <SELECTITEM id="1" cmd="24" menuId="50" text="D02D8103012400820281828F0A018053E34EE48BBE7F6E8F0A02804E1A52A14ECB7ECD8F0A0380724867434FE1606F">
+        <SELECTITEM id="1" cmd="24" menuId="01" text="D0218103012400820281828F0A01806DFB52A083DC53558F0A02805220966483DC5355">
+            <DISPLAYTEXT id="1" cmd="21" menuId="01" text="D0228103012181820281028D1708662F542666F465B04E0B8F7D83DC535552178868FF1F"></DISPLAYTEXT>
+            <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D01A8103012101820281028D0F0883DC5355522096646210529FFF01"></DISPLAYTEXT>
+        </SELECTITEM>
+        <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D081BB8103012181820281028D81AF08201C00530049004D5FEB6377786E8BA4201D662F4E2D56FD79FB52A863D04F9B7684FF0C57FA4E8E624B673A00530049004D53617684727982725B8951688EAB4EFD8BA48BC1670D52A1300276F86BD44F207EDF75286237540D5BC678018BA48BC165B95F0FFF0C5B83517767094E0D53EF62E6622A30014E0D4F208F935BC6780130014F7F75285FEB63777B49727970B9FF0C662F60A87545884C4E9280547F5176848EAB4EFD536B58EB3002"></DISPLAYTEXT>
+        <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D02E8103012181820281028D23084E2D56FD79FB52A8901A4FE167099650516C53F8FF0C0031002E00307248672C3002">
+        </DISPLAYTEXT>
+    </SELECTITEM>
+    <SELECTITEM id="2" cmd="24" menuId="4E" text="D04E810301240082028182850F80005500530049004D53614FE1606F8F0A0180536172477C7B578B8F14028075358BDD53F7780153CA77ED4FE15BB991CF8F100380004F00540041529F80FD4ECB7ECD">
+        <DISPLAYTEXT id="1" cmd="21" menuId="01" text="D03A8103012181820281028D2F08666E901A005500530049004D5361002000560032002E003000410027FF0C652F6301004F005400410033529F80FD"></DISPLAYTEXT>
+        <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D05C8103012181820281028D510875358BDD53F77801672C5B5850A85BB991CF0035003000306761FF0C5DF2752875358BDD672C003100336761FF0C77ED4FE15B5850A85BB991CF003500306761FF0C5DF2752877ED4FE1003400396761"></DISPLAYTEXT>
+        <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D05E8103012181820281028D5308004F00540041529F80FD53EF5229752877ED4FE1606F901A9053FF0C5E2E52A95BA262375B9E73B0005500530049004D536151854E1A52A183DC5355768452A860014E0B8F7D3001522096644E0E66F465B0"></DISPLAYTEXT>
+    </SELECTITEM>
+</SETUPMENU>
+<!-- Grouped Card Metadata -->
+<CardProfile>
+    <ATR>3F979580BFFE8210428031A073BE211797</ATR>
+    <EID>89049032000001000000000254806853</EID>
+</CardProfile>
+</IccProfile>
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml
new file mode 100755
index 00000000000..c3e6db772bc
--- /dev/null
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/etc/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml
@@ -0,0 +1,211 @@
+<IccProfile>
+<MF path="3F00">
+    <EF name="EF_DIR" id="2F00" structure="linear fixed">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A8205422100300483022F008A01058B032F0601800200C08801F0</SIMIO>
+        <SIMIO cmd="B2" p1="1" p2="4" p3="30" data="">144,0,61184F10A0000003431002FF86FF0389FFFFFFFF50044353494DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="2" p2="4" p3="30" data="">144,0,61184F10A0000000871002FF86FF0389FFFFFFFF50045553494DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="3" p2="4" p3="30" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+        <SIMIO cmd="B2" p1="4" p2="4" p3="30" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+    </EF>
+    <EF name="EF_ICCID" id="2FE2" structure="transparent">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183022FE28A01058B032F06038002000A880110</SIMIO>
+        <SIMIO cmd="B0" p1="0" p2="0" p3="A" data="">144,0,98683081462002318389</SIMIO>
+        <!-- Special ATC to read ICCID from modem cache -->
+        <CCID>89860318640220133898</CCID>
+    </EF>
+    <EF name="EF_PL" id="2F05" structure="transparent">
+        <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183022F058A01058B032F060280020004880128</SIMIO>
+        <SIMIO cmd="B0" p1="0" p2="0" p3="4" data="">144,0,FFFFFFFF</SIMIO>
+    </EF>
+
+    <DF name="TELECOM" path="7F10">
+        <DF name="PHONEBOOK" path="5F3A">
+            <EF name="EF_PBR" id="4F30" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62198205422100400283024F308A01058B036F0606800200808800</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="40" data="">144,0,A81EC0034F3A01C1034F3306C5034F0902C4034F1104C6034F2503C9034F3107A905CA034F5008AA0FC2034F4A09C7034F4B0AC8034F4C0BFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="40" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_GAS" id="4F4C" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A8205422100140A83024F4C8A01058B036F060E800200C8880158</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="3" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="4" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="5" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="6" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="7" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="8" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="9" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="A" p2="4" p3="E" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_ADN" id="4F3A" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A82054221001C1483024F3A8A01058B036F060E80020230880108</SIMIO>
+                <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="2" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="3" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="4" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="5" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="6" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="7" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="8" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="9" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="A" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="B" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="C" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="D" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="E" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="F" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="10" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="11" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="12" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="13" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+                <SIMIO cmd="B2" p1="14" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+            </EF>
+            <EF name="EF_IAP" id="4F33" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A820542210001FA83024F338A01058B036F060E800200FA880130</SIMIO>
+            </EF>
+            <EF name="EF_PBC" id="4F09" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A820542210002FA83024F098A01058B036F060E800201F4880110</SIMIO>
+            </EF>
+            <EF name="EF_ANR" id="4F11" structure="linear fixed">
+                <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621A82054221000FFA83024F118A01058B036F060E80020EA6880120</SIMIO>
+            </EF>
+            <!-- EF_SNE, EF_AAS, EF_EXT1, EF_GRP, EF_UID, EF_EMAIL, EF_CCP1, EF_PUR1 ... -->
+        </DF>
+    </DF>
+
+    <ADF name="USIM" path="7FFF" aid="A0000000871002FF86FF0389FFFFFFFF">
+        <EF name="EF_IMSI" id="6F07" structure="transparent">
+            <CIMI>311740123456790</CIMI>
+        </EF>
+        <EF name="EF_MSISDN" id="6F40" structure="linear fixed">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621982054221001C0283026F408A01058B036F0605800200388800</SIMIO>
+            <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,00000000000000000000000000000891688118109844F0FFFFFFFFFF</SIMIO>
+        </EF>
+        <EF name="EF_MBI" id="6FC9" structure="linear fixed">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62258205422100040183026FC9A503C001408A01058B066F060103000080020004810200188800</SIMIO>
+            <SIMIO cmd="B2" p1="1" p2="4" p3="4" data="">144,0,01000000</SIMIO>
+       </EF>
+       <EF name="EF_AD" id="6FAD" structure="transparent">
+            <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62178202412183026FAD8A01058B036F060180020004880118</SIMIO>
+            <SIMIO cmd="B0" p1="0" p2="0" p3="4" data="">144,0,00000002</SIMIO>
+       </EF>
+       <EF name="EF_MBDN" id="6FC7" structure="linear fixed">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62258205422100260483026FC7A503C001408A01058B066F060103000080020098810200AC8800</SIMIO>
+           <SIMIO cmd="DC" p1="1" p2="4" p3="26" data="74616741FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF06812143658709FFFFFFFFFFFFFF">144,0</SIMIO>
+           <SIMIO cmd="DC" p1="1" p2="4" p3="26" data="74616742FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF06819078563412FFFFFFFFFFFFFF">144,0</SIMIO>
+           <SIMIO cmd="DC" p1="1" p2="4" p3="26" data="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF">144,0</SIMIO>
+       </EF>
+       <EF name="EF_MWIS" id="6FCA" structure="linear fixed">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,62198205422100050183026FCA8A01058B036F060E800200058800</SIMIO>
+           <SIMIO cmd="B2" p1="1" p2="4" p3="5" data="">144,0,0000000000</SIMIO>
+       </EF>
+       <EF name="EF_VOICE_MAIL_INDICATOR_CPHS" id="6F11" structure="transparent">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">106,130</SIMIO>
+       </EF>
+       <EF name="EF_FPLMN" id="6F7B" structure="transparent">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621C8202412183026F7BA5038001718A01058B036F06038002001E880168</SIMIO>
+           <SIMIO cmd="B0" p1="0" p2="0" p3="1E" data="">144,0,64F00064F02064F04064F07064F080FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+       </EF>
+       <EF name="EF_FDN" id="6F3B" structure="linear fixed">
+           <SIMIO cmd="C0" p1="0" p2="0" p3="F" data="">144,0,621982054221001C0A83026F3B8A01058B036F0605800201188800</SIMIO>
+           <SIMIO cmd="B2" p1="1" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="2" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="3" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="4" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="5" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="6" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="7" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="8" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="9" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+           <SIMIO cmd="B2" p1="A" p2="4" p3="1C" data="">144,0,FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</SIMIO>
+       </EF>
+       <!-- Other USIM files... -->
+     </ADF>
+</MF>
+
+<ADF name="PKCS15" aid="A000000063504B43532D3135">
+    <File id="4300">
+        <CGLA cmd="00a40004024300">76,62228202412183024300A503C001408A01058B066F0601010001800201DC810201EE88009000</CGLA>
+        <CGLA cmd="00b0000000">516,30088200300404024310301AA0120410A000000476416E64726F696443545340300404024311301AA0120410A000000476416E64726F696443545341300404024312301AA0120410A000000476416E64726F696443545342300404024313301AA0120410A000000476416E64726F696443545343300404024314301AA0120410A000000476416E64726F696443545344300404024315301AA0120410A000000476416E64726F696443545345300404024316301AA0120410A000000476416E64726F6964435453463004040243173010A0080406FFFFFFFFFFFF300404024318301AA0120410A000000476416E64726F696443545347300404024313301AA0129000</CGLA>
+    </File>
+    <File id="4318">
+        <CGLA cmd="00a40004024318">76,62228202412183024318A503C001408A01058B066F0601010001800200188102002A88009000</CGLA>
+        <CGLA cmd="00b0000000">124,3016041461ED377E85D386A8DFEE6B864BD85B0BFAA5AF8130220420CE7B2B47AE2B7552C8F92CC29124279883041FB623A5F194A82C9BF15D492AA09000</CGLA>
+    </File>
+</ADF>
+
+<ADF name="" aid="CSIM">
+    <CSIM cmd="0070000001">6,019000</CSIM>
+    <CSIM cmd="80f2000000">110,62338202782183023F00A50C80016187010183040007DBF08A01058B062F0601020002C60C90016083010183010A83010D8102FFFF9000</CSIM>
+    <CSIM cmd="0070000000">6,019000</CSIM>
+    <CSIM cmd="0070800100">4,9000</CSIM>
+    <CSIM cmd="80F20000">4,6C35</CSIM>
+    <CGLA cmd="00A40000023F00">4,6B00</CGLA>
+    <CGLA cmd="00A4000C023F00">4,9000</CGLA>
+    <CGLA cmd="00ff000000">4,6D00</CGLA>
+    <CGLA cmd="81f2ff0000">4,6B00</CGLA>
+    <CGLA cmd="00a4000c02FFFF">4,6A82</CGLA>
+    <CGLA cmd="0170830100">4,6A81</CGLA>
+    <CGLA cmd="fff2000000">4,6E00</CGLA>
+    <CGLA cmd="00a4000c022FE2">4,9000</CGLA>
+    <CGLA cmd="00b0000000">24,983311111111111111029000</CGLA>
+    <CGLA cmd="00a40004022F06">78,622382054221004A1283022F06A503C001408A01058B062F060101000080020534810205489000</CGLA>
+    <!-- more CSIM Command -->
+</ADF>
+
+<ADF name="" aid="">
+    <CSIM cmd='10,"0070000001"'>6,019000</CSIM>
+    <CGLA cmd='1,14,"81F2FF0000"'>4,6b00</CGLA>
+    <!-- more CGLA Command -->
+</ADF>
+
+<PinProfile>
+    <!-- PIN: PINSTATE_ENABLED_NOT_VERIFIED -->
+    <!-- PUK: PINSTATE_ENABLED_BLOCKED -->
+    <!-- Ready: PINSTATE_UNKNOWN -->
+    <PINSTATE>PINSTATE_UNKNOWN</PINSTATE>
+    <PINCODE>1234</PINCODE>
+    <PUKCODE>12345678</PUKCODE>
+    <PINREMAINTIMES>3</PINREMAINTIMES>
+    <PUKREMAINTIMES>10</PUKREMAINTIMES>
+    <PIN2CODE>1234</PIN2CODE>
+    <PUK2CODE>12345678</PUK2CODE>
+    <PIN2REMAINTIMES>3</PIN2REMAINTIMES>
+    <PUK2REMAINTIMES>10</PUK2REMAINTIMES>
+</PinProfile>
+
+<FacilityLock>
+    <SC>DISABLE</SC>
+    <FD>DISABLE</FD>
+    <AO>DISABLE</AO>
+    <OI>DISABLE</OI>
+    <AI>DISABLE</AI>
+    <IR>DISABLE</IR>
+    <AB>DISABLE</AB>
+    <AG>DISABLE</AG>
+    <AC>DISABLE</AC>
+</FacilityLock>
+
+<SETUPMENU cmd="25" text="D0388103012500820281820509804E2D56FD79FB52A88F10508000530049004D5FEB6377786E8BA48F104E80005500530049004D53614FE1606F">
+    <SELECTITEM id="1" cmd="24" menuId="50" text="D02D8103012400820281828F0A018053E34EE48BBE7F6E8F0A02804E1A52A14ECB7ECD8F0A0380724867434FE1606F">
+        <SELECTITEM id="1" cmd="24" menuId="01" text="D0218103012400820281828F0A01806DFB52A083DC53558F0A02805220966483DC5355">
+            <DISPLAYTEXT id="1" cmd="21" menuId="01" text="D0228103012181820281028D1708662F542666F465B04E0B8F7D83DC535552178868FF1F"></DISPLAYTEXT>
+            <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D01A8103012101820281028D0F0883DC5355522096646210529FFF01"></DISPLAYTEXT>
+        </SELECTITEM>
+        <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D081BB8103012181820281028D81AF08201C00530049004D5FEB6377786E8BA4201D662F4E2D56FD79FB52A863D04F9B7684FF0C57FA4E8E624B673A00530049004D53617684727982725B8951688EAB4EFD8BA48BC1670D52A1300276F86BD44F207EDF75286237540D5BC678018BA48BC165B95F0FFF0C5B83517767094E0D53EF62E6622A30014E0D4F208F935BC6780130014F7F75285FEB63777B49727970B9FF0C662F60A87545884C4E9280547F5176848EAB4EFD536B58EB3002"></DISPLAYTEXT>
+        <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D02E8103012181820281028D23084E2D56FD79FB52A8901A4FE167099650516C53F8FF0C0031002E00307248672C3002">
+        </DISPLAYTEXT>
+    </SELECTITEM>
+    <SELECTITEM id="2" cmd="24" menuId="4E" text="D04E810301240082028182850F80005500530049004D53614FE1606F8F0A0180536172477C7B578B8F14028075358BDD53F7780153CA77ED4FE15BB991CF8F100380004F00540041529F80FD4ECB7ECD">
+        <DISPLAYTEXT id="1" cmd="21" menuId="01" text="D03A8103012181820281028D2F08666E901A005500530049004D5361002000560032002E003000410027FF0C652F6301004F005400410033529F80FD"></DISPLAYTEXT>
+        <DISPLAYTEXT id="2" cmd="21" menuId="02" text="D05C8103012181820281028D510875358BDD53F77801672C5B5850A85BB991CF0035003000306761FF0C5DF2752875358BDD672C003100336761FF0C77ED4FE15B5850A85BB991CF003500306761FF0C5DF2752877ED4FE1003400396761"></DISPLAYTEXT>
+        <DISPLAYTEXT id="3" cmd="21" menuId="03" text="D05E8103012181820281028D5308004F00540041529F80FD53EF5229752877ED4FE1606F901A9053FF0C5E2E52A95BA262375B9E73B0005500530049004D536151854E1A52A183DC5355768452A860014E0B8F7D3001522096644E0E66F465B0"></DISPLAYTEXT>
+    </SELECTITEM>
+</SETUPMENU>
+<!-- Grouped Card Metadata -->
+<CardProfile>
+    <ATR>3F979580BFFE8210428031A073BE211797</ATR>
+    <EID>89049032000001000000000254806853</EID>
+</CardProfile>
+</IccProfile>
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/main.cpp b/base/cvd/cuttlefish/host/commands/modem_simulator/main.cpp
index 3bfc1ec2e99..040b5cce472 100644
--- a/base/cvd/cuttlefish/host/commands/modem_simulator/main.cpp
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/main.cpp
@@ -89,7 +89,9 @@ int ModemSimulatorMain(int argc, char** argv) {
   NvramConfig::InitNvramConfigService(server_fds.size(), FLAGS_sim_type);
 
   // Don't get a SIGPIPE from the clients
-  if (sigaction(SIGPIPE, nullptr, nullptr) != 0) {
+  struct sigaction sa{};
+  sa.sa_handler = SIG_IGN;
+  if (sigaction(SIGPIPE, &sa, nullptr) != 0) {
     LOG(ERROR) << "Failed to set SIGPIPE to be ignored: " << strerror(errno);
   }
 
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.cpp b/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.cpp
index 0d5f7646fd4..46f4d802781 100644
--- a/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.cpp
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.cpp
@@ -313,6 +313,12 @@ std::vector<CommandHandler> SimService::InitializeCommandHandlers() {
       CommandHandler(
           "+CICCID",
           [this](const Client& client) { this->HandleGetIccId(client); }),
+      CommandHandler(
+          "+CEID",
+          [this](const Client& client) { this->HandleGetEid(client); }),
+      CommandHandler(
+          "+CATR",
+          [this](const Client& client) { this->HandleGetAtr(client); }),
       CommandHandler("+CLCK=",
                      [this](const Client& client, std::string& cmd) {
                        this->HandleFacilityLock(client, cmd);
@@ -1323,6 +1329,58 @@ void SimService::HandleGetIccId(const Client& client) {
   client.SendCommandResponse(responses);
 }
 
+void SimService::HandleGetEid(const Client& client) {
+  std::vector<std::string> responses;
+
+  XMLElement* root = sim_file_system_.GetRootElement();
+  if (!root) {
+    client.SendCommandResponse(kCmeErrorOperationNotAllowed);
+    return;
+  }
+
+  XMLElement* card_profile = root->FirstChildElement("CardProfile");
+  if (!card_profile) {
+    client.SendCommandResponse(kCmeErrorNotFound);
+    return;
+  }
+
+  XMLElement* final = card_profile->FirstChildElement("EID");
+  if (!final) {
+    client.SendCommandResponse(kCmeErrorNotFound);
+    return;
+  }
+
+  responses.push_back("+CEID: " + std::string(final->GetText()));
+  responses.push_back("OK");
+  client.SendCommandResponse(responses);
+}
+
+void SimService::HandleGetAtr(const Client& client) {
+  std::vector<std::string> responses;
+
+  XMLElement* root = sim_file_system_.GetRootElement();
+  if (!root) {
+    client.SendCommandResponse(kCmeErrorOperationNotAllowed);
+    return;
+  }
+
+  XMLElement* card_profile = root->FirstChildElement("CardProfile");
+  if (!card_profile) {
+    client.SendCommandResponse(kCmeErrorNotFound);
+    return;
+  }
+
+  XMLElement* final = card_profile->FirstChildElement("ATR");
+  if (!final) {
+    client.SendCommandResponse(kCmeErrorNotFound);
+    return;
+  }
+
+  responses.push_back("+CATR: " + std::string(final->GetText()));
+  responses.push_back("OK");
+  client.SendCommandResponse(responses);
+}
+
 /*
  * AT+CLCK
  *   Execute command is used to lock, unlock or interrogate a MT or a network
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.h b/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.h
index 198aa697bfb..e3695f7791f 100644
--- a/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.h
+++ b/base/cvd/cuttlefish/host/commands/modem_simulator/sim_service.h
@@ -42,6 +42,8 @@ class SimService : public ModemService, public std::enable_shared_from_this<SimS
   void HandleCSIM_IO(const Client& client, const std::string& command);
   void HandleGetIMSI(const Client& client);
   void HandleGetIccId(const Client& client);
+  void HandleGetEid(const Client& client);
+  void HandleGetAtr(const Client& client);
   void HandleFacilityLock(const Client& client, const std::string& command);
   void HandleOpenLogicalChannel(const Client& client,
                                 const std::string& command);
diff --git a/base/cvd/cuttlefish/package/BUILD.bazel b/base/cvd/cuttlefish/package/BUILD.bazel
index 27de4a1cff1..384d90d0042 100644
--- a/base/cvd/cuttlefish/package/BUILD.bazel
+++ b/base/cvd/cuttlefish/package/BUILD.bazel
@@ -117,6 +117,8 @@ package_files(
         "cuttlefish-common/etc/cvd_custom_action_config/cuttlefish_example_action_config.json": "//cuttlefish/host/example_custom_actions:custom_action_config.json",
         "cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml",
         "cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim0.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim0.xml",
+        "cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml",
+        "cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim1.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim1.xml",
         "cuttlefish-common/etc/modem_simulator/files/numeric_operator.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/numeric_operator.xml",
         # "cuttlefish-common/bin/crosvm": "@crosvm_bin//:crosvm__crosvm", # TODO: b/402274999 - currently requires --enable_sandbox=false
         "cuttlefish-common/usr/share/webrtc/assets/client.html": "//cuttlefish/host/frontend/webrtc/html_client:client.html",
diff --git a/e2etests/debian_substitution_marker b/e2etests/debian_substitution_marker
index 83c485fcbfb..67931cfb2e4 100644
--- a/e2etests/debian_substitution_marker
+++ b/e2etests/debian_substitution_marker
@@ -275,6 +275,16 @@ symlinks: {
   link_name: "etc/modem_simulator/files/iccprofile_for_sim0.xml"
 }
 
+symlinks: {
+  target: "/usr/lib/cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml"
+  link_name: "etc/modem_simulator/files/iccprofile_for_sim1_for_CtsCarrierApiTestCases.xml"
+}
+
+symlinks: {
+  target: "/usr/lib/cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim1.xml"
+  link_name: "etc/modem_simulator/files/iccprofile_for_sim1.xml"
+}
+
 symlinks: {
   target: "/usr/lib/cuttlefish-common/etc/modem_simulator/files/numeric_operator.xml"
   link_name: "etc/modem_simulator/files/numeric_operator.xml"
diff --git a/gigabyte-ampere-cuttlefish-installer/utils/download-ci-cf.sh b/gigabyte-ampere-cuttlefish-installer/utils/download-ci-cf.sh
index 3872c447c5a..62d1594b175 100755
--- a/gigabyte-ampere-cuttlefish-installer/utils/download-ci-cf.sh
+++ b/gigabyte-ampere-cuttlefish-installer/utils/download-ci-cf.sh
@@ -4,11 +4,11 @@
 
 set -o errexit
 
-URL=https://ci.android.com/builds/latest/branches/aosp-android-latest-release/targets/aosp_cf_arm64_only_phone-userdebug/view/BUILD_INFO
-RURL=$(curl -Ls -o /dev/null -w %{url_effective} ${URL})
-echo "RURL = ${RURL}"
-
-BUILD_ID=$(echo "${RURL}" | sed -n 's/.*\/builds\/submitted\/\([^\/]*\)\/.*/\1/p')
+BRANCH=aosp-android-latest-release
+TARGET=aosp_cf_arm64_only_phone-userdebug
+BUILD_ID=$(curl -fsS \
+    "https://ci.android.com/builds/branches/${BRANCH}/targets/${TARGET}/status.json" \
+    | sed -n 's/.*[{,[:space:]]"last_known_good_build"[[:space:]]*:[[:space:]]*"\([0-9][0-9]*\)".*/\1/p')
 echo "BUILD_ID = ${BUILD_ID}"
 
 if [[ -z "${BUILD_ID}" ]]; then
@@ -19,12 +19,9 @@ fi
 FILENAME="aosp_cf_arm64_only_phone-img-${BUILD_ID}.zip"
 echo "FILENAME = ${FILENAME}"
 
-if [[ -z "${FILENAME}" ]]; then
-    echo "Error: FILENAME empty."
-    exit 1
-fi
+RAWURL="https://ci.android.com/builds/submitted/${BUILD_ID}/${TARGET}/latest/raw"
 
-wget -nv -c ${RURL%/view/BUILD_INFO}/raw/${FILENAME}
-wget -nv -c ${RURL%/view/BUILD_INFO}/raw/cvd-host_package.tar.gz
+wget -nv -c ${RAWURL}/${FILENAME}
+wget -nv -c ${RAWURL}/cvd-host_package.tar.gz
 
 exit 0
diff --git a/tools/baseimage/pkg/gce/gce.go b/tools/baseimage/pkg/gce/gce.go
index 9093424dc6f..cd26abed16d 100644
--- a/tools/baseimage/pkg/gce/gce.go
+++ b/tools/baseimage/pkg/gce/gce.go
@@ -295,6 +295,12 @@ func (h *GceHelper) BuildImage(project, zone string, opts BuildImageOpts) error
 	defer h.cleanupDetachDisk(insName, attachedDiskName)
 	log.Println("disk attached")
 
+	log.Println("waiting for instance to become responsive over SSH...")
+	if err := WaitForInstance(project, zone, insName); err != nil {
+		return fmt.Errorf("instance failed to become responsive over SSH: %w", err)
+	}
+	log.Println("instance is responsive over SSH")
+
 	if err := UploadBashScript(project, zone, insName, "fill_available_disk_space.sh", scripts.FillAvailableDiskSpace); err != nil {
 		return fmt.Errorf("error uploading script: %v", err)
 	}
diff --git a/tools/baseimage/pkg/gce/scripts/install_kernel_main.sh b/tools/baseimage/pkg/gce/scripts/install_kernel_main.sh
index 0bfa854c367..363fe9513ac 100644
--- a/tools/baseimage/pkg/gce/scripts/install_kernel_main.sh
+++ b/tools/baseimage/pkg/gce/scripts/install_kernel_main.sh
@@ -52,6 +52,20 @@ if [ "${version}" != "${linux_image_deb}" ]; then
   exit 1
 fi
 
+# Remove old kernel packages, keeping only the target kernel and the
+# linux-image-cloud-${arch} meta-package.
+old_kernels=$(sudo chroot /mnt/image /usr/bin/dpkg -l | grep '^ii' | awk '{print $2}' | \
+  grep '^linux-image-' | grep -v "^${linux_image_deb}$" | grep -v "^linux-image-cloud-${arch}$" || true)
+if [ -n "${old_kernels}" ]; then
+  echo "Removing old kernel packages: ${old_kernels}"
+  sudo chroot /mnt/image /usr/bin/apt-get purge -y ${old_kernels}
+  # update-grub may fail in a chroot; the grub config will be rebuilt
+  # when the image boots, so this is non-fatal.
+  sudo chroot /mnt/image /bin/sh -c 'command -v update-grub >/dev/null && update-grub || true'
+else
+  echo "No old kernel packages to remove"
+fi
+
 # Skip unmounting:
 #  Sometimes systemd starts, making it hard to unmount
 #  In any case we'll unmount cleanly when the instance shuts down