diff --git a/.github/workflows/mlmodeldownloader.yml b/.github/workflows/mlmodeldownloader.yml
index 0f05aa23611..b68db76e5c7 100644
--- a/.github/workflows/mlmodeldownloader.yml
+++ b/.github/workflows/mlmodeldownloader.yml
@@ -25,7 +25,7 @@ jobs:
         target: [ios, tvos, macos, watchos]
         build-env:
           - os: macos-14
-            xcode: Xcode_15.2
+            xcode: Xcode_16.2
           - os: macos-15
             xcode: Xcode_16.2
     runs-on: ${{ matrix.build-env.os }}
@@ -48,7 +48,7 @@ jobs:
 
   mlmodeldownloader-cron-only:
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     strategy:
@@ -58,6 +58,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Configure test keychain
@@ -78,6 +80,8 @@ jobs:
       cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
     steps:
       - uses: actions/checkout@v4
+      - name: Xcode
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
       - name: Generate Swift Package.resolved
         id: swift_package_resolve
         run: |
@@ -99,11 +103,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-            xcode: Xcode_15.2
-            target: iOS
           - os: macos-14
-            xcode: Xcode_15.4
+            xcode: Xcode_16.2
             target: iOS
           - os: macos-15
             xcode: Xcode_16.2
@@ -161,13 +162,15 @@ jobs:
     if: github.repository == 'Firebase/firebase-ios-sdk' && (github.event_name == 'schedule' || github.event_name == 'pull_request')
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
       with:
         cache_key: build-test${{ matrix.os }}
     - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Install GoogleService-Info.plist
diff --git a/FirebaseMLModelDownloader/Sources/DeviceLogger.swift b/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
index 06a040e1f59..bbcd78a67c2 100644
--- a/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
+++ b/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 
-@_implementationOnly import FirebaseCoreExtension
+internal import FirebaseCoreExtension
 
 /// Enum of log messages.
 enum LoggerMessageCode: Int {
diff --git a/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift b/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift
index 1f66bf8a0b2..d1e0e79902e 100644
--- a/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift
+++ b/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift
@@ -14,9 +14,9 @@
 
 import Foundation
 #if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_UserDefaults
+  internal import GoogleUtilities_UserDefaults
 #else
-  @_implementationOnly import GoogleUtilities
+  internal import GoogleUtilities
 #endif // SWIFT_PACKAGE
 
 /// Protocol to save or delete model info in user defaults.
diff --git a/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift b/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift
index 5c51c5fded8..cd5aaedc301 100644
--- a/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift
+++ b/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift
@@ -14,9 +14,9 @@
 
 import Foundation
 #if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_UserDefaults
+  internal import GoogleUtilities_UserDefaults
 #else
-  @_implementationOnly import GoogleUtilities
+  internal import GoogleUtilities
 #endif // SWIFT_PACKAGE
 
 /// Model info object with details about downloaded and locally available model.
diff --git a/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift b/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift
index c0f218bfd9e..ef30f1aa70a 100644
--- a/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift
+++ b/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift
@@ -14,9 +14,9 @@
 
 import Foundation
 #if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_UserDefaults
+  internal import GoogleUtilities_UserDefaults
 #else
-  @_implementationOnly import GoogleUtilities
+  internal import GoogleUtilities
 #endif // SWIFT_PACKAGE
 
 /// Task to download model file to device.
diff --git a/FirebaseMLModelDownloader/Sources/ModelDownloader.swift b/FirebaseMLModelDownloader/Sources/ModelDownloader.swift
index fb99d831209..3241f50e317 100644
--- a/FirebaseMLModelDownloader/Sources/ModelDownloader.swift
+++ b/FirebaseMLModelDownloader/Sources/ModelDownloader.swift
@@ -16,9 +16,9 @@ import FirebaseCore
 import FirebaseInstallations
 import Foundation
 #if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_UserDefaults
+  internal import GoogleUtilities_UserDefaults
 #else
-  @_implementationOnly import GoogleUtilities
+  internal import GoogleUtilities
 #endif // SWIFT_PACKAGE
 
 /// Possible ways to get a custom model.
diff --git a/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift b/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift
index e84211f6111..7bc09af0e1a 100644
--- a/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift
+++ b/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift
@@ -23,9 +23,9 @@
   @testable import FirebaseMLModelDownloader
   import XCTest
   #if SWIFT_PACKAGE
-    @_implementationOnly import GoogleUtilities_UserDefaults
+    internal import GoogleUtilities_UserDefaults
   #else
-    @_implementationOnly import GoogleUtilities
+    internal import GoogleUtilities
   #endif // SWIFT_PACKAGE
 
   extension GULUserDefaults {
diff --git a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
index 0797cea72ac..ad08f3a273d 100644
--- a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
+++ b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
@@ -23,9 +23,9 @@
   @testable import FirebaseMLModelDownloader
   import XCTest
   #if SWIFT_PACKAGE
-    @_implementationOnly import GoogleUtilities_UserDefaults
+    internal import GoogleUtilities_UserDefaults
   #else
-    @_implementationOnly import GoogleUtilities
+    internal import GoogleUtilities
   #endif // SWIFT_PACKAGE
 
   /// Mock options to configure default Firebase app.