diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
index a0a62f03e..aea6109a2 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
@@ -36,6 +36,9 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm
 
     private static final boolean TEST_ENTRANCE_TRANSITION = true;
     private static final int NUM_ROWS = 10;
+    // Row heights default to wrap content
+    private static final boolean USE_FIXED_ROW_HEIGHT = false;
+
     private ArrayObjectAdapter mRowsAdapter;
     private BackgroundHelper mBackgroundHelper = new BackgroundHelper();
 
@@ -88,8 +91,11 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm
 
     private void setupRows() {
         ListRowPresenter lrp = new ListRowPresenter();
-        lrp.setRowHeight(CardPresenter.getRowHeight(getActivity()));
-        lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity()));
+
+        if (USE_FIXED_ROW_HEIGHT) {
+            lrp.setRowHeight(CardPresenter.getRowHeight(getActivity()));
+            lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity()));
+        }
 
         mRowsAdapter = new ArrayObjectAdapter(lrp);
 
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java
index 2509bfc01..bf0840269 100644
--- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java
+++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java
@@ -42,6 +42,9 @@ public class RowsFragment extends android.support.v17.leanback.app.RowsFragment
     private static final String TAG = "leanback.RowsFragment";
 
     private static final int NUM_ROWS = 10;
+    // Row heights default to wrap content
+    private static final boolean USE_FIXED_ROW_HEIGHT = false;
+
     private ArrayObjectAdapter mRowsAdapter;
     private OnRowsFirstLineSelectedListener mCallback;
 
@@ -81,8 +84,11 @@ public class RowsFragment extends android.support.v17.leanback.app.RowsFragment
 
     private void setupRows() {
         ListRowPresenter lrp = new ListRowPresenter();
-        lrp.setRowHeight(CardPresenter.getRowHeight(getActivity()));
-        lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity()));
+
+        if (USE_FIXED_ROW_HEIGHT) {
+            lrp.setRowHeight(CardPresenter.getRowHeight(getActivity()));
+            lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity()));
+        }
 
         mRowsAdapter = new ArrayObjectAdapter(lrp);