diff --git a/samples/AutofillKeyboard/res/layout/keyboard_10_9_9.xml b/samples/AutofillKeyboard/res/layout/keyboard_10_9_9.xml
index 846de355d..fc7bdb174 100644
--- a/samples/AutofillKeyboard/res/layout/keyboard_10_9_9.xml
+++ b/samples/AutofillKeyboard/res/layout/keyboard_10_9_9.xml
@@ -22,10 +22,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/KeyboardArea">
 
-  <LinearLayout
-      android:id="@+id/suggestion_view"
-      style="@style/KeyboardRow.Header">
-  </LinearLayout>
+  <HorizontalScrollView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+    <LinearLayout
+        android:id="@+id/suggestion_view"
+        style="@style/KeyboardRow.Header">
+    </LinearLayout>
+  </HorizontalScrollView>
 
   <LinearLayout style="@style/KeyboardRow">
     <TextView
diff --git a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
index d6070efc4..2a4714777 100644
--- a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
+++ b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
@@ -16,7 +16,6 @@
 
 package com.example.android.autofillkeyboard;
 
-import android.content.res.Resources;
 import android.inputmethodservice.InputMethodService;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ -101,7 +100,7 @@ public class AutofillImeService extends InputMethodService {
                 getResources().getResourceName(R.style.GreenTheme)).build());
 
         return new InlineSuggestionsRequest.Builder(presentationSpecs)
-                .setMaxSuggestionCount(2)
+                .setMaxSuggestionCount(6)
                 .build();
     }
 
diff --git a/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
index ac97bdaaa..80f522b0b 100644
--- a/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
+++ b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
@@ -62,7 +62,7 @@ public class InlineFillService extends AutofillService {
     /**
      * Number of datasets sent on each request - we're simple, that value is hardcoded in our DNA!
      */
-    static final int NUMBER_DATASETS = 4;
+    static final int NUMBER_DATASETS = 6;
 
     @Override
     public void onFillRequest(FillRequest request, CancellationSignal cancellationSignal,