diff --git a/samples/InlineFillService/AndroidManifest.xml b/samples/InlineFillService/AndroidManifest.xml
index c08ca855d..29e60da8b 100644
--- a/samples/InlineFillService/AndroidManifest.xml
+++ b/samples/InlineFillService/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="foo.bar.fill" >
+    package="foo.bar.inline" >
     <application>
         <service
             android:name=".InlineFillService"
diff --git a/samples/InlineFillService/src/foo/bar/fill/InlineFillService.java b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
similarity index 80%
rename from samples/InlineFillService/src/foo/bar/fill/InlineFillService.java
rename to samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
index 0a5705c51..45cc8f912 100644
--- a/samples/InlineFillService/src/foo/bar/fill/InlineFillService.java
+++ b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package foo.bar.fill;
+package foo.bar.inline;
 
 import android.app.assist.AssistStructure;
 import android.app.assist.AssistStructure.ViewNode;
@@ -28,6 +28,7 @@ import android.service.autofill.FillCallback;
 import android.service.autofill.FillContext;
 import android.service.autofill.FillRequest;
 import android.service.autofill.FillResponse;
+import android.service.autofill.InlinePresentation;
 import android.service.autofill.SaveCallback;
 import android.service.autofill.SaveInfo;
 import android.service.autofill.SaveRequest;
@@ -50,7 +51,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import foo.bar.fill.R;
+import foo.bar.inline.R;
 
 /**
  * A basic {@link AutofillService} implementation that only shows dynamic-generated datasets
@@ -82,8 +83,13 @@ public class InlineFillService extends AutofillService {
             return;
         }
 
+        final InlineSuggestionsRequest inlineRequest = request.getInlineSuggestionsRequest();
+        final int maxSuggestionsCount = inlineRequest == null
+                ? NUMBER_DATASETS
+                : Math.min(inlineRequest.getMaxSuggestionCount(), NUMBER_DATASETS);
+
         // Create the base response
-        FillResponse response = createResponse(this, fields, NUMBER_DATASETS,
+        FillResponse response = createResponse(this, fields, maxSuggestionsCount,
                 request.getInlineSuggestionsRequest());
         callback.onSuccess(response);
     }
@@ -95,47 +101,10 @@ public class InlineFillService extends AutofillService {
         FillResponse.Builder response = new FillResponse.Builder();
         // 1.Add the dynamic datasets
         for (int i = 1; i <= numDatasets; i++) {
-            Dataset unlockedDataset = newUnlockedDataset(fields, packageName, i);
+            Dataset unlockedDataset = newUnlockedDataset(fields, packageName, i, inlineRequest);
             response.addDataset(unlockedDataset);
         }
 
-        if (inlineRequest != null) {
-            Log.d(TAG, "Found InlineSuggestionsRequest in FillRequest: " + inlineRequest);
-            final int maxSuggestionsCount = Math.min(inlineRequest.getMaxSuggestionCount(),
-                    NUMBER_DATASETS);
-            final List<InlinePresentationSpec> presentationSpecs =
-                    inlineRequest.getPresentationSpecs();
-            final int specsSize = presentationSpecs.size();
-
-            InlinePresentationSpec currentSpecs = presentationSpecs.get(0);
-            for (int i = 1; i <= maxSuggestionsCount; i++) {
-                if (currentSpecs == null) {
-                    break;
-                }
-
-                if (i < specsSize) {
-                    currentSpecs = presentationSpecs.get(i);
-                }
-
-                final Uri uri = new Uri.Builder().appendPath("BasicService-" + i).build();
-                final ArrayList<String> autofillHints = new ArrayList<>();
-                autofillHints.add(fields.keyAt(0));
-                final Slice suggestionSlice = new Slice.Builder(uri,
-                        new SliceSpec("InlineSuggestion", 1))
-                        .addInt(currentSpecs.getMinSize().getWidth(), "SUBTYPE_MIN_WIDTH",
-                                Collections.EMPTY_LIST)
-                        .addInt(currentSpecs.getMaxSize().getWidth(), "SUBTYPE_MAX_WIDTH",
-                                Collections.EMPTY_LIST)
-                        .addInt(currentSpecs.getMinSize().getHeight(), "SUBTYPE_MIN_HEIGHT",
-                                Collections.EMPTY_LIST)
-                        .addInt(currentSpecs.getMaxSize().getHeight(), "SUBTYPE_MAX_HEIGHT",
-                                Collections.EMPTY_LIST)
-                        .addHints(autofillHints)
-                        .build();
-                response.addInlineSuggestionSlice(suggestionSlice);
-            }
-        }
-
         // 2.Add save info
         Collection<AutofillId> ids = fields.values();
         AutofillId[] requiredIds = new AutofillId[ids.size()];
@@ -149,19 +118,42 @@ public class InlineFillService extends AutofillService {
     }
 
     static Dataset newUnlockedDataset(@NonNull Map<String, AutofillId> fields,
-            @NonNull String packageName, int i) {
+            @NonNull String packageName, int i, @Nullable InlineSuggestionsRequest inlineRequest) {
+
         Dataset.Builder dataset = new Dataset.Builder();
         for (Entry<String, AutofillId> field : fields.entrySet()) {
-            String hint = field.getKey();
-            AutofillId id = field.getValue();
-            String value = hint + i;
+            final String hint = field.getKey();
+            final AutofillId id = field.getValue();
+            final String value = hint + i;
 
             // We're simple - our dataset values are hardcoded as "hintN" (for example,
             // "username1", "username2") and they're displayed as such, except if they're a
             // password
-            String displayValue = hint.contains("password") ? "password for #" + i : value;
-            RemoteViews presentation = newDatasetPresentation(packageName, displayValue);
-            dataset.setValue(id, AutofillValue.forText(value), presentation);
+            final String displayValue = hint.contains("password") ? "password for #" + i : value;
+            final RemoteViews presentation = newDatasetPresentation(packageName, displayValue);
+
+            // Add Inline Suggestion required info.
+            InlinePresentation inlinePresentation = null;
+            if (inlineRequest != null) {
+                Log.d(TAG, "Found InlineSuggestionsRequest in FillRequest: " + inlineRequest);
+
+                final Uri uri = new Uri.Builder().appendPath("BasicService-" + i).build();
+                final ArrayList<String> autofillHints = new ArrayList<>();
+                autofillHints.add(hint);
+                final Slice suggestionSlice = new Slice.Builder(uri,
+                        new SliceSpec("InlineSuggestion", 1))
+                        .addHints(autofillHints)
+                        .build();
+
+                final List<InlinePresentationSpec> specs = inlineRequest.getPresentationSpecs();
+                final int specsSize = specs.size();
+                final InlinePresentationSpec currentSpec = i < specsSize
+                        ? specs.get(i)
+                        : specs.get(specsSize - 1);
+                inlinePresentation = new InlinePresentation(suggestionSlice, currentSpec);
+            }
+
+            dataset.setValue(id, AutofillValue.forText(value), presentation, inlinePresentation);
         }
 
         return dataset.build();