diff --git a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
index 40ba0a643..19c6dae82 100644
--- a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
+++ b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
@@ -26,7 +26,7 @@ import android.util.Size;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inline.InlinePresentationSpec;
+import android.widget.inline.InlinePresentationSpec;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InlineSuggestion;
 import android.view.inputmethod.InlineSuggestionsRequest;
@@ -164,7 +164,7 @@ public class AutofillImeService extends InputMethodService {
         for (int i=0; i<totalSuggestionsCount; i++) {
             final int index = i;
             InlineSuggestion inlineSuggestion = inlineSuggestions.get(index);
-            Size size = inlineSuggestion.getInfo().getPresentationSpec().getMaxSize();
+            Size size = inlineSuggestion.getInfo().getInlinePresentationSpec().getMaxSize();
             inlineSuggestion.inflate(this, size,
                     AsyncTask.THREAD_POOL_EXECUTOR,
                     suggestionView -> {
diff --git a/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
index babf95373..cd9d97669 100644
--- a/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
+++ b/samples/InlineFillService/src/foo/bar/inline/InlineFillService.java
@@ -40,7 +40,7 @@ import android.util.Log;
 import android.util.Size;
 import android.view.autofill.AutofillId;
 import android.view.autofill.AutofillValue;
-import android.view.inline.InlinePresentationSpec;
+import android.widget.inline.InlinePresentationSpec;
 import android.view.inputmethod.InlineSuggestionsRequest;
 import android.widget.RemoteViews;
 import android.widget.Toast;
@@ -112,7 +112,7 @@ public class InlineFillService extends AutofillService {
             if (inlineRequest != null) {
                 final Slice authSlice = new InlinePresentationBuilder("Tap to auth respones")
                         .build();
-                final List<InlinePresentationSpec> specs = inlineRequest.getPresentationSpecs();
+                final List<InlinePresentationSpec> specs = inlineRequest.getInlinePresentationSpecs();
                 final int specsSize = specs.size();
                 final InlinePresentationSpec currentSpec = specsSize > 0 ? specs.get(0) : null;
                 inlinePresentation = new InlinePresentation(authSlice, currentSpec,
@@ -157,7 +157,7 @@ public class InlineFillService extends AutofillService {
                         final Slice authSlice = new InlinePresentationBuilder(
                                 "Tap to auth " + value).build();
                         final List<InlinePresentationSpec> specs
-                                = inlineRequest.getPresentationSpecs();
+                                = inlineRequest.getInlinePresentationSpecs();
                         final int specsSize = specs.size();
                         final InlinePresentationSpec currentSpec =
                                 specsSize > 0 ? specs.get(0) : null;
@@ -176,15 +176,15 @@ public class InlineFillService extends AutofillService {
             }
         }
 
-        if (inlineRequest != null) {
-            // Reuse the first spec's height for the inline action size, as there isn't dedicated
-            // value from the request for this.
-            final int height = inlineRequest.getPresentationSpecs().get(0).getMinSize().getHeight();
-            final Size actionIconSize = new Size(height, height);
-            response.addDataset(
-                    newInlineActionDataset(context, actionIconSize, R.drawable.ic_settings,
-                            fields));
-        }
+//        if (inlineRequest != null) {
+//            // Reuse the first spec's height for the inline action size, as there isn't dedicated
+//            // value from the request for this.
+//            final int height = inlineRequest.getPresentationSpecs().get(0).getMinSize().getHeight();
+//            final Size actionIconSize = new Size(height, height);
+//            response.addDataset(
+//                    newInlineActionDataset(context, actionIconSize, R.drawable.ic_settings,
+//                            fields));
+//        }
 
         // 2.Add save info
         Collection<AutofillId> ids = fields.values();
@@ -206,6 +206,7 @@ public class InlineFillService extends AutofillService {
                 PendingIntent.FLAG_UPDATE_CURRENT);
         final Slice suggestionSlice = new InlinePresentationBuilder()
                 .setStartIcon(Icon.createWithResource(context, drawable))
+                .setAttribution(pendingIntent)
                 .build();
         final InlinePresentationSpec currentSpec = new InlinePresentationSpec.Builder(size,
                 size).build();
@@ -239,9 +240,14 @@ public class InlineFillService extends AutofillService {
             if (inlineRequest != null) {
                 Log.d(TAG, "Found InlineSuggestionsRequest in FillRequest: " + inlineRequest);
 
-                final Slice suggestionSlice = new InlinePresentationBuilder(value).build();
+                Intent intent = new Intent().setComponent(
+                        new ComponentName(context.getPackageName(), SettingsActivity.class.getName()));
+                PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent,
+                        PendingIntent.FLAG_UPDATE_CURRENT);
+                final Slice suggestionSlice = new InlinePresentationBuilder(value)
+                        .setAttribution(pendingIntent).build();
 
-                final List<InlinePresentationSpec> specs = inlineRequest.getPresentationSpecs();
+                final List<InlinePresentationSpec> specs = inlineRequest.getInlinePresentationSpecs();
                 final int specsSize = specs.size();
                 final InlinePresentationSpec currentSpec = i - 1 < specsSize
                         ? specs.get(i - 1)