diff --git a/res/layout/choose_sim_activity.xml b/res/layout/choose_sim_activity.xml
index 05ab2300e30..693c6e1914d 100644
--- a/res/layout/choose_sim_activity.xml
+++ b/res/layout/choose_sim_activity.xml
@@ -14,11 +14,12 @@
      limitations under the License.
 -->
 
-<com.google.android.setupdesign.GlifLayout
+<com.google.android.setupdesign.GlifRecyclerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/glif_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:entries="@xml/items_multiple_carrier"
     android:icon="@drawable/ic_network_signal_blue">
 
     <LinearLayout
@@ -45,4 +46,4 @@
             android:entries="@xml/items_multiple_carrier" />
 
     </LinearLayout>
-</com.google.android.setupdesign.GlifLayout>
+</com.google.android.setupdesign.GlifRecyclerLayout>
diff --git a/src/com/android/settings/sim/ChooseSimActivity.java b/src/com/android/settings/sim/ChooseSimActivity.java
index f8bdc3011b5..f51445a92a9 100644
--- a/src/com/android/settings/sim/ChooseSimActivity.java
+++ b/src/com/android/settings/sim/ChooseSimActivity.java
@@ -41,7 +41,6 @@ import com.google.android.setupdesign.items.IItem;
 import com.google.android.setupdesign.items.Item;
 import com.google.android.setupdesign.items.ItemGroup;
 import com.google.android.setupdesign.items.RecyclerItemAdapter;
-import com.google.android.setupdesign.view.HeaderRecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,13 +103,12 @@ public class ChooseSimActivity extends Activity
         }
 
         GlifLayout layout = findViewById(R.id.glif_layout);
-        TextView textView = findViewById(R.id.subtitle);
         int subscriptionCount = mEmbeddedSubscriptions.size();
         if (mHasPsim) { // Choose a number to use
             subscriptionCount++;
         }
         layout.setHeaderText(getString(R.string.choose_sim_title));
-        textView.setText(getString(R.string.choose_sim_text, subscriptionCount));
+        layout.setDescriptionText(getString(R.string.choose_sim_text, subscriptionCount));
 
         displaySubscriptions();
 
@@ -217,7 +215,7 @@ public class ChooseSimActivity extends Activity
 
     private void displaySubscriptions() {
         View rootView = findViewById(android.R.id.content);
-        GlifRecyclerLayout layout = rootView.findViewById(R.id.recycler_list);
+        GlifRecyclerLayout layout = rootView.findViewById(R.id.glif_layout);
         RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
         adapter.setOnItemSelectedListener(this);
         mItemGroup = (ItemGroup) adapter.getRootItemHierarchy();
@@ -265,10 +263,6 @@ public class ChooseSimActivity extends Activity
             item.setId(index++);
             mItemGroup.addChild(item);
         }
-
-        // This removes the unused header artifact from GlifRecyclerLayout.
-        HeaderRecyclerView rv = (HeaderRecyclerView) layout.getRecyclerView();
-        rv.getHeader().setVisibility(View.GONE);
     }
 
     private void updateSubscriptions() {