diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java
index 7f8ddfd7a57d2..1254bac828e42 100644
--- a/core/java/android/app/Service.java
+++ b/core/java/android/app/Service.java
@@ -312,7 +312,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
      * full {@link Intent#ACTION_ASSIST} Intent with all of the context of the current
      * running foreground services.  You can override this method to place into the bundle
      * anything you would like to appear as an item in the
-     * {@link Intent#EXTRA_SERVICES_ASSIST_CONTEXT} part of the assist Intent.
+     * {@link Intent#EXTRA_ASSIST_SERVICES_CONTEXTS} part of the assist Intent.
      * This method will not be called if this service is not in the foreground.
      * The default implementation does nothing.
      */
diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java
index a57a8536afa6d..3f17dc4ff37a6 100644
--- a/core/java/android/content/pm/ServiceInfo.java
+++ b/core/java/android/content/pm/ServiceInfo.java
@@ -50,9 +50,9 @@ public class ServiceInfo extends ComponentInfo
 
     /**
      * Bit in {@link #flags}: If set,
-     * {@link Service#onProvideAssistData(android.os.Bundle)} will be
-     * called on the service when it is running in the foreground. Set from
-     * the {@link android.R.attr#provideAssistData} attribute.
+     * {@link android.app.Service#onProvideAssistData(android.os.Bundle)} will
+     * be called on the service when it is running in the foreground. Set from
+     * the android.R.attr#provideAssistData attribute.
      */
     public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004;