diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8aeefdb..1753ce5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12495,6 +12495,16 @@
     <string name="calls_preference_title">Calls</string>
     <!-- Provider Model: SMS preference title -->
     <string name="sms_preference_title">SMS</string>
+    <!-- Provider Model: Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_preferred">preferred</string>
+    <!-- Provider Model: Calls Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_calls_preferred">calls preferred</string>
+    <!-- Provider Model: SMS Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_sms_preferred">SMS preferred</string>
+    <!-- Provider Model: Unavailable status in summary for Calls & SMS -->
+    <string name="calls_sms_unavailable">unavailable</string>
+    <!-- Provider Model: No SIM status in summary for Calls & SMS -->
+    <string name="calls_sms_no_sim">No SIM</string>
     <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
     <string name="network_and_internet_preferences_title">Preferences</string>
     <!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
index 3cbf3cb..f14953c 100644
--- a/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
@@ -35,7 +35,7 @@
 
     @Override
     public boolean isChecked() {
-        return !SystemProperties.getBoolean(TRANSCODE_DEFAULT_SYS_PROP_KEY, false);
+        return !SystemProperties.getBoolean(TRANSCODE_DEFAULT_SYS_PROP_KEY, true);
     }
 
     @Override
diff --git a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
index f36f4cb..c15806d 100644
--- a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
@@ -41,7 +41,7 @@
 
     @Override
     public boolean isChecked() {
-        return SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, false);
+        return SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, true);
     }
 
     @Override
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index e56db27..7ce98e8 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -21,6 +21,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.util.Log;
 
 import androidx.appcompat.app.AlertDialog;
@@ -38,6 +39,7 @@
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @SearchIndexable
@@ -186,6 +188,18 @@
             new BaseSearchIndexProvider(R.xml.network_and_internet) {
 
                 @Override
+                // TODO(b/167474581): Should remove this method when Provider Model finished.
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    if (Utils.isProviderModelEnabled(context)) {
+                        final SearchIndexableResource sir = new SearchIndexableResource(context);
+                        sir.xmlResId = R.xml.network_provider_internet;
+                        return Arrays.asList(sir);
+                    }
+                    return super.getXmlResourcesToIndex(context, enabled);
+                }
+
+                @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
                         context) {
                     return buildPreferenceControllers(context, null /* lifecycle */,
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
index f7d9221..3a228dc 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
@@ -22,7 +22,6 @@
 import android.os.UserManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
@@ -42,10 +41,6 @@
 
     private static final String TAG = "NetworkProviderCallsSmsController";
     private static final String KEY = "calls_and_sms";
-    private static final String PREFERRED_CALL_SMS = "preferred";
-    private static final String PREFERRED_CALL = "calls preferred";
-    private static final String PREFERRED_SMS = "SMS preferred";
-    private static final String UNAVAILABLE = "unavailable";
 
     private UserManager mUserManager;
     private SubscriptionManager mSubscriptionManager;
@@ -91,7 +86,7 @@
                 mSubscriptionManager);
 
         if (subs.isEmpty()) {
-            return null;
+            return setSummaryResId(R.string.calls_sms_no_sim);
         } else {
             final StringBuilder summary = new StringBuilder();
             for (SubscriptionInfo subInfo : subs) {
@@ -131,19 +126,23 @@
         boolean isSmsPreferred = subId == getDefaultSmsSubscriptionId();
 
         if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-            status = UNAVAILABLE;
+            status = setSummaryResId(R.string.calls_sms_unavailable);
         } else {
             if (isDataPreferred && isSmsPreferred) {
-                status = PREFERRED_CALL_SMS;
+                status = setSummaryResId(R.string.calls_sms_preferred);
             } else if (isDataPreferred) {
-                status = PREFERRED_CALL;
+                status = setSummaryResId(R.string.calls_sms_calls_preferred);
             } else if (isSmsPreferred) {
-                status = PREFERRED_SMS;
+                status = setSummaryResId(R.string.calls_sms_sms_preferred);
             }
         }
         return status;
     }
 
+    private String setSummaryResId(int resId) {
+        return mContext.getResources().getString(resId);
+    }
+
     @VisibleForTesting
     protected int getDefaultVoiceSubscriptionId(){
         return SubscriptionManager.getDefaultVoiceSubscriptionId();
@@ -167,6 +166,7 @@
         if (subs.isEmpty()) {
             mPreference.setEnabled(false);
         } else {
+            mPreference.setEnabled(true);
             mPreference.setFragment(NetworkProviderCallsSmsFragment.class.getCanonicalName());
         }
     }
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
index 061e1c0..8444f11 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
@@ -27,6 +27,7 @@
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 
+import com.android.settings.testutils.ResourcesUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.RestrictedPreference;
 
@@ -46,6 +47,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 
 import static org.mockito.Mockito.doReturn;
@@ -60,10 +62,6 @@
     private static final String KEY_PREFERENCE_CALLS_SMS = "calls_and_sms";
     private static final String DISPLAY_NAME_1 = "Sub 1";
     private static final String DISPLAY_NAME_2 = "Sub 2";
-    private static final String PREFERRED_CALL_SMS = "preferred";
-    private static final String PREFERRED_CALL = "calls preferred";
-    private static final String PREFERRED_SMS = "SMS preferred";
-    private static final String UNAVAILABLE = "unavailable";
 
     @Mock
     private SubscriptionManager mSubscriptionManager;
@@ -150,6 +148,20 @@
         when(subscriptionInfo.getDisplayName()).thenReturn(displayName);
     }
 
+    private String setSummaryResId(String resName) {
+        return ResourcesUtils.getResourcesString(mContext, resName);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_noSim_returnNoSim() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
+        displayPreferenceWithLifecycle();
+
+        assertTrue(TextUtils.equals(mController.getSummary(),
+                setSummaryResId("calls_sms_no_sim")));
+    }
+
     @Test
     @UiThreadTest
     public void getSummary_invalidSubId_returnUnavailable() {
@@ -162,7 +174,7 @@
         final StringBuilder summary = new StringBuilder();
         summary.append(DISPLAY_NAME_1)
                 .append(" (")
-                .append(UNAVAILABLE)
+                .append(setSummaryResId("calls_sms_unavailable"))
                 .append(")");
 
         assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -181,7 +193,7 @@
         final StringBuilder summary = new StringBuilder();
         summary.append(DISPLAY_NAME_1)
                 .append(" (")
-                .append(UNAVAILABLE)
+                .append(setSummaryResId("calls_sms_unavailable"))
                 .append(")")
                 .append(", ")
                 .append(DISPLAY_NAME_2);
@@ -233,12 +245,12 @@
         final StringBuilder summary = new StringBuilder();
         summary.append(DISPLAY_NAME_1)
                 .append(" (")
-                .append(PREFERRED_CALL)
+                .append(setSummaryResId("calls_sms_calls_preferred"))
                 .append(")")
                 .append(", ")
                 .append(DISPLAY_NAME_2)
                 .append(" (")
-                .append(PREFERRED_SMS)
+                .append(setSummaryResId("calls_sms_sms_preferred"))
                 .append(")");
 
         assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -260,12 +272,12 @@
         final StringBuilder summary = new StringBuilder();
         summary.append(DISPLAY_NAME_1)
                 .append(" (")
-                .append(PREFERRED_SMS)
+                .append(setSummaryResId("calls_sms_sms_preferred"))
                 .append(")")
                 .append(", ")
                 .append(DISPLAY_NAME_2)
                 .append(" (")
-                .append(PREFERRED_CALL)
+                .append(setSummaryResId("calls_sms_calls_preferred"))
                 .append(")");
 
         assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -287,7 +299,7 @@
         final StringBuilder summary = new StringBuilder();
         summary.append(DISPLAY_NAME_1)
                 .append(" (")
-                .append(PREFERRED_CALL_SMS)
+                .append(setSummaryResId("calls_sms_preferred"))
                 .append(")")
                 .append(", ")
                 .append(DISPLAY_NAME_2);
diff --git a/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java
index 968afb8..4b8a272 100644
--- a/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.network.telephony;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
@@ -23,7 +25,10 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.core.BasePreferenceController;
+
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
@@ -40,4 +45,10 @@
         mController = new CrossSimCallingPreferenceController(mContext, "cross_sim_calling_key");
         mController.init(SUB_ID);
     }
+
+    @Test
+    public void controller_isUnavailable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
 }
