diff --git a/samples/InlineFillService/src/com/example/android/inlinefillservice/AuthActivity.java b/samples/InlineFillService/src/com/example/android/inlinefillservice/AuthActivity.java
index cb9cf880e..9d9ed7aa3 100644
--- a/samples/InlineFillService/src/com/example/android/inlinefillservice/AuthActivity.java
+++ b/samples/InlineFillService/src/com/example/android/inlinefillservice/AuthActivity.java
@@ -114,6 +114,6 @@ public class AuthActivity extends Activity {
         }
 
         return PendingIntent.getActivity(context, ++sPendingIntentId, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT).getIntentSender();
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE).getIntentSender();
     }
 }
diff --git a/samples/InlineFillService/src/com/example/android/inlinefillservice/InlineRequestHelper.java b/samples/InlineFillService/src/com/example/android/inlinefillservice/InlineRequestHelper.java
index c93771af6..0aff9d226 100644
--- a/samples/InlineFillService/src/com/example/android/inlinefillservice/InlineRequestHelper.java
+++ b/samples/InlineFillService/src/com/example/android/inlinefillservice/InlineRequestHelper.java
@@ -79,7 +79,7 @@ public class InlineRequestHelper {
             InlineSuggestionsRequest inlineRequest, int drawable) {
         PendingIntent pendingIntent =
                 PendingIntent.getActivity(context, 0, new Intent(context, SettingsActivity.class),
-                        PendingIntent.FLAG_UPDATE_CURRENT);
+                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
 
         Dataset.Builder builder =
                 new Dataset.Builder()
@@ -126,9 +126,8 @@ public class InlineRequestHelper {
         Intent intent = new Intent(context, AttributionDialogActivity.class);
         intent.putExtra(AttributionDialogActivity.KEY_MSG, msg);
         // Should use different request code to avoid the new intent overriding the old one.
-        PendingIntent pendingIntent =
-                PendingIntent.getActivity(
-                        context, msg.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, msg.hashCode(), intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
         return pendingIntent;
     }