Merge changes from topic "generic_to_abstract" into androidx-main am: b00a6a780f

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2592610

Change-Id: I12d8a1ca9c568b124631b6f3381c7b38a24fb515
Signed-off-by: Automerger Merge Worker <[email protected]>

diff --git a/activity/activity/api/current.txt b/activity/activity/api/current.txt
index 22ecc41..636c36c 100644
--- a/activity/activity/api/current.txt
+++ b/activity/activity/api/current.txt

@@ -85,7 +85,10 @@
 
   public abstract class OnBackPressedCallback {
     ctor public OnBackPressedCallback(boolean enabled);
+    method @MainThread @RequiresApi(34) public void handleOnBackCancelled();
     method @MainThread public abstract void handleOnBackPressed();
+    method @MainThread @RequiresApi(34) public void handleOnBackProgressed(android.window.BackEvent backEvent);
+    method @MainThread @RequiresApi(34) public void handleOnBackStarted(android.window.BackEvent backEvent);
     method @MainThread public final boolean isEnabled();
     method @MainThread public final void remove();
     method @MainThread public final void setEnabled(boolean);
@@ -95,8 +98,12 @@
   public final class OnBackPressedDispatcher {
     ctor public OnBackPressedDispatcher();
     ctor public OnBackPressedDispatcher(optional Runnable? fallbackOnBackPressed);
+    ctor public OnBackPressedDispatcher(Runnable? fallbackOnBackPressed, androidx.core.util.Consumer<java.lang.Boolean>? onHasEnabledCallbacksChanged);
     method @MainThread public void addCallback(androidx.activity.OnBackPressedCallback onBackPressedCallback);
     method @MainThread public void addCallback(androidx.lifecycle.LifecycleOwner owner, androidx.activity.OnBackPressedCallback onBackPressedCallback);
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackCancelled();
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackProgressed(android.window.BackEvent backEvent);
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackStarted(android.window.BackEvent backEvent);
     method @MainThread public boolean hasEnabledCallbacks();
     method @MainThread public void onBackPressed();
     method @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public void setOnBackInvokedDispatcher(android.window.OnBackInvokedDispatcher invoker);

diff --git a/activity/activity/api/restricted_current.txt b/activity/activity/api/restricted_current.txt
index 10c4134..94f0f54 100644
--- a/activity/activity/api/restricted_current.txt
+++ b/activity/activity/api/restricted_current.txt

@@ -84,7 +84,10 @@
 
   public abstract class OnBackPressedCallback {
     ctor public OnBackPressedCallback(boolean enabled);
+    method @MainThread @RequiresApi(34) public void handleOnBackCancelled();
     method @MainThread public abstract void handleOnBackPressed();
+    method @MainThread @RequiresApi(34) public void handleOnBackProgressed(android.window.BackEvent backEvent);
+    method @MainThread @RequiresApi(34) public void handleOnBackStarted(android.window.BackEvent backEvent);
     method @MainThread public final boolean isEnabled();
     method @MainThread public final void remove();
     method @MainThread public final void setEnabled(boolean);
@@ -94,8 +97,12 @@
   public final class OnBackPressedDispatcher {
     ctor public OnBackPressedDispatcher();
     ctor public OnBackPressedDispatcher(optional Runnable? fallbackOnBackPressed);
+    ctor public OnBackPressedDispatcher(Runnable? fallbackOnBackPressed, androidx.core.util.Consumer<java.lang.Boolean>? onHasEnabledCallbacksChanged);
     method @MainThread public void addCallback(androidx.activity.OnBackPressedCallback onBackPressedCallback);
     method @MainThread public void addCallback(androidx.lifecycle.LifecycleOwner owner, androidx.activity.OnBackPressedCallback onBackPressedCallback);
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackCancelled();
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackProgressed(android.window.BackEvent backEvent);
+    method @MainThread @RequiresApi(34) @VisibleForTesting public void dispatchOnBackStarted(android.window.BackEvent backEvent);
     method @MainThread public boolean hasEnabledCallbacks();
     method @MainThread public void onBackPressed();
     method @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public void setOnBackInvokedDispatcher(android.window.OnBackInvokedDispatcher invoker);

diff --git a/activity/activity/lint-baseline.xml b/activity/activity/lint-baseline.xml
index d97aee4..08512e7 100644
--- a/activity/activity/lint-baseline.xml
+++ b/activity/activity/lint-baseline.xml

@@ -10,4 +10,13 @@
             file="src/main/java/androidx/activity/ComponentActivity.java"/>
     </issue>
 
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            onBackInvokedCallback = if (BuildCompat.isAtLeastU()) {"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/OnBackPressedDispatcher.kt"/>
+    </issue>
+
 </issues>

diff --git a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt
index 1ff31b7..47717b5 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt

@@ -17,6 +17,8 @@
 package androidx.activity
 
 import android.os.Build
+import android.window.BackEvent
+import android.window.BackEvent.EDGE_LEFT
 import android.window.OnBackInvokedCallback
 import android.window.OnBackInvokedDispatcher
 import androidx.annotation.RequiresApi
@@ -180,4 +182,59 @@
 
         assertThat(unregisterCount).isEqualTo(1)
     }
+
+    @Test
+    @RequiresApi(34)
+    @SdkSuppress(minSdkVersion = 34)
+    fun testSimpleAnimatedCallback() {
+        var registerCount = 0
+        var unregisterCount = 0
+        val invoker = object : OnBackInvokedDispatcher {
+            override fun registerOnBackInvokedCallback(p0: Int, p1: OnBackInvokedCallback) {
+                registerCount++
+            }
+
+            override fun unregisterOnBackInvokedCallback(p0: OnBackInvokedCallback) {
+                unregisterCount++
+            }
+        }
+
+        val dispatcher = OnBackPressedDispatcher()
+
+        dispatcher.setOnBackInvokedDispatcher(invoker)
+
+        var startedCount = 0
+        var progressedCount = 0
+        var cancelledCount = 0
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackStarted(backEvent: BackEvent) {
+                startedCount++
+            }
+
+            override fun handleOnBackProgressed(backEvent: BackEvent) {
+                progressedCount++
+            }
+            override fun handleOnBackPressed() { }
+            override fun handleOnBackCancelled() {
+                cancelledCount++
+            }
+        }
+
+        dispatcher.addCallback(callback)
+
+        assertThat(registerCount).isEqualTo(1)
+
+        dispatcher.dispatchOnBackStarted(BackEvent(0.1F, 0.1F, 0.1F, EDGE_LEFT))
+        assertThat(startedCount).isEqualTo(1)
+
+        dispatcher.dispatchOnBackProgressed(BackEvent(0.1F, 0.1F, 0.1F, EDGE_LEFT))
+        assertThat(progressedCount).isEqualTo(1)
+
+        dispatcher.dispatchOnBackCancelled()
+        assertThat(cancelledCount).isEqualTo(1)
+
+        callback.remove()
+
+        assertThat(unregisterCount).isEqualTo(1)
+    }
 }

diff --git a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
index 51cf3de..afbe0ea 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt

@@ -441,6 +441,80 @@
             withActivity { realDispatcher.onBackPressed() }
         }
     }
+
+    @Test
+    fun testOnHasEnabledCallbacks() {
+        var reportedHasEnabledCallbacks = false
+        var reportCount = 0
+        val dispatcher = OnBackPressedDispatcher(
+            fallbackOnBackPressed = null,
+            onHasEnabledCallbacksChanged = {
+                reportedHasEnabledCallbacks = it
+                reportCount++
+            }
+        )
+
+        assertWithMessage("initial reportCount")
+            .that(reportCount)
+            .isEqualTo(0)
+        assertWithMessage("initial reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isFalse()
+
+        val callbackA = dispatcher.addCallback(enabled = false) {}
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(0)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isFalse()
+
+        callbackA.isEnabled = true
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(1)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isTrue()
+
+        val callbackB = dispatcher.addCallback {}
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(1)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isTrue()
+
+        callbackA.remove()
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(1)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isTrue()
+
+        callbackB.remove()
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(2)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isFalse()
+
+        dispatcher.addCallback {}
+
+        assertWithMessage("reportCount")
+            .that(reportCount)
+            .isEqualTo(3)
+        assertWithMessage("reportedHasEnabledCallbacks")
+            .that(reportedHasEnabledCallbacks)
+            .isTrue()
+    }
 }
 
 open class CountingOnBackPressedCallback(

diff --git a/activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.kt b/activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.kt
index 3101ef7..bc4b001 100644
--- a/activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.kt
+++ b/activity/activity/src/main/java/androidx/activity/OnBackPressedCallback.kt

@@ -15,7 +15,9 @@
  */
 package androidx.activity
 
+import android.window.BackEvent
 import androidx.annotation.MainThread
+import androidx.annotation.RequiresApi
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
@@ -67,11 +69,38 @@
     fun remove() = cancellables.forEach { it.cancel() }
 
     /**
+     * Callback for handling the system UI generated equivalent to
+     * [OnBackPressedDispatcher.dispatchOnBackStarted].
+     */
+    @Suppress("CallbackMethodName") /* mirror handleOnBackPressed local style */
+    @RequiresApi(34)
+    @MainThread
+    open fun handleOnBackStarted(backEvent: BackEvent) {}
+
+    /**
+     * Callback for handling the system UI generated equivalent to
+     * [OnBackPressedDispatcher.dispatchOnBackProgressed].
+     */
+    @Suppress("CallbackMethodName") /* mirror handleOnBackPressed local style */
+    @RequiresApi(34)
+    @MainThread
+    open fun handleOnBackProgressed(backEvent: BackEvent) {}
+
+    /**
      * Callback for handling the [OnBackPressedDispatcher.onBackPressed] event.
      */
     @MainThread
     abstract fun handleOnBackPressed()
 
+    /**
+     * Callback for handling the system UI generated equivalent to
+     * [OnBackPressedDispatcher.dispatchOnBackCancelled].
+     */
+    @Suppress("CallbackMethodName") /* mirror handleOnBackPressed local style */
+    @RequiresApi(34)
+    @MainThread
+    open fun handleOnBackCancelled() {}
+
     @JvmName("addCancellable")
     internal fun addCancellable(cancellable: Cancellable) {
         cancellables.add(cancellable)

diff --git a/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.kt b/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.kt
index 5319d9e..0c97526 100644
--- a/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.kt
+++ b/activity/activity/src/main/java/androidx/activity/OnBackPressedDispatcher.kt

@@ -16,11 +16,18 @@
 package androidx.activity
 
 import android.os.Build
+import android.window.BackEvent
+import android.window.OnBackAnimationCallback
 import android.window.OnBackInvokedCallback
 import android.window.OnBackInvokedDispatcher
 import androidx.annotation.DoNotInline
 import androidx.annotation.MainThread
+import androidx.annotation.OptIn
 import androidx.annotation.RequiresApi
+import androidx.annotation.VisibleForTesting
+import androidx.core.os.BuildCompat
+import androidx.core.os.BuildCompat.PrereleaseSdkCheck
+import androidx.core.util.Consumer
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
@@ -51,14 +58,26 @@
  * When constructing an instance of this class, the [fallbackOnBackPressed] can be set to
  * receive a callback if [onBackPressed] is called when [hasEnabledCallbacks] returns `false`.
  */
-class OnBackPressedDispatcher @JvmOverloads constructor(
-    private val fallbackOnBackPressed: Runnable? = null
+// Implementation/API compatibility note: previous releases included only the Runnable? constructor,
+// which permitted both first-argument and trailing lambda call syntax to specify
+// fallbackOnBackPressed. To avoid silently breaking source compatibility the new
+// primary constructor has no optional parameters to avoid ambiguity/wrong overload resolution
+// when a single parameter is provided as a trailing lambda.
+@OptIn(PrereleaseSdkCheck::class)
+class OnBackPressedDispatcher constructor(
+    private val fallbackOnBackPressed: Runnable?,
+    private val onHasEnabledCallbacksChanged: Consumer<Boolean>?
 ) {
     private val onBackPressedCallbacks = ArrayDeque<OnBackPressedCallback>()
-    private var enabledChangedCallback: (() -> Unit)? = null
     private var onBackInvokedCallback: OnBackInvokedCallback? = null
     private var invokedDispatcher: OnBackInvokedDispatcher? = null
     private var backInvokedCallbackRegistered = false
+    private var hasEnabledCallbacks = false
+
+    @JvmOverloads
+    constructor(
+        fallbackOnBackPressed: Runnable? = null
+    ) : this(fallbackOnBackPressed, null)
 
     /**
      * Sets the [OnBackInvokedDispatcher] for handling system back for Android SDK T+.
@@ -68,12 +87,11 @@
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     fun setOnBackInvokedDispatcher(invoker: OnBackInvokedDispatcher) {
         invokedDispatcher = invoker
-        updateBackInvokedCallbackState()
+        updateBackInvokedCallbackState(hasEnabledCallbacks)
     }
 
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    internal fun updateBackInvokedCallbackState() {
-        val shouldBeRegistered = hasEnabledCallbacks()
+    private fun updateBackInvokedCallbackState(shouldBeRegistered: Boolean) {
         val dispatcher = invokedDispatcher
         val onBackInvokedCallback = onBackInvokedCallback
         if (dispatcher != null && onBackInvokedCallback != null) {
@@ -94,12 +112,30 @@
         }
     }
 
+    private fun updateEnabledCallbacks() {
+        val hadEnabledCallbacks = hasEnabledCallbacks
+        val hasEnabledCallbacks = onBackPressedCallbacks.any { it.isEnabled }
+        this.hasEnabledCallbacks = hasEnabledCallbacks
+        if (hasEnabledCallbacks != hadEnabledCallbacks) {
+            onHasEnabledCallbacksChanged?.accept(hasEnabledCallbacks)
+            if (Build.VERSION.SDK_INT >= 33) {
+                updateBackInvokedCallbackState(hasEnabledCallbacks)
+            }
+        }
+    }
+
     init {
         if (Build.VERSION.SDK_INT >= 33) {
-            enabledChangedCallback = {
-                updateBackInvokedCallbackState()
+            onBackInvokedCallback = if (BuildCompat.isAtLeastU()) {
+                Api34Impl.createOnBackAnimationCallback(
+                    { backEvent -> onBackStarted(backEvent) },
+                    { backEvent -> onBackProgressed(backEvent) },
+                    { onBackPressed() },
+                    { onBackCancelled() }
+                )
+            } else {
+                Api33Impl.createOnBackInvokedCallback { onBackPressed() }
             }
-            onBackInvokedCallback = Api33Impl.createOnBackInvokedCallback { onBackPressed() }
         }
     }
 
@@ -137,10 +173,8 @@
         onBackPressedCallbacks.add(onBackPressedCallback)
         val cancellable = OnBackPressedCancellable(onBackPressedCallback)
         onBackPressedCallback.addCancellable(cancellable)
-        if (Build.VERSION.SDK_INT >= 33) {
-            updateBackInvokedCallbackState()
-            onBackPressedCallback.enabledChangedCallback = enabledChangedCallback
-        }
+        updateEnabledCallbacks()
+        onBackPressedCallback.enabledChangedCallback = ::updateEnabledCallbacks
         return cancellable
     }
 
@@ -178,21 +212,55 @@
         onBackPressedCallback.addCancellable(
             LifecycleOnBackPressedCancellable(lifecycle, onBackPressedCallback)
         )
-        if (Build.VERSION.SDK_INT >= 33) {
-            updateBackInvokedCallbackState()
-            onBackPressedCallback.enabledChangedCallback = enabledChangedCallback
-        }
+        updateEnabledCallbacks()
+        onBackPressedCallback.enabledChangedCallback = ::updateEnabledCallbacks
     }
 
     /**
-     * Checks if there is at least one [enabled][OnBackPressedCallback.isEnabled]
+     * Returns `true` if there is at least one [enabled][OnBackPressedCallback.isEnabled]
      * callback registered with this dispatcher.
      *
      * @return True if there is at least one enabled callback.
      */
     @MainThread
-    fun hasEnabledCallbacks(): Boolean = onBackPressedCallbacks.any {
-        it.isEnabled
+    fun hasEnabledCallbacks(): Boolean = hasEnabledCallbacks
+
+    @VisibleForTesting
+    @RequiresApi(34)
+    @MainThread
+    fun dispatchOnBackStarted(backEvent: BackEvent) {
+        onBackStarted(backEvent)
+    }
+
+    @RequiresApi(34)
+    @MainThread
+    private fun onBackStarted(backEvent: BackEvent) {
+        val callback = onBackPressedCallbacks.lastOrNull {
+            it.isEnabled
+        }
+        if (callback != null) {
+            callback.handleOnBackStarted(backEvent)
+            return
+        }
+    }
+
+    @VisibleForTesting
+    @RequiresApi(34)
+    @MainThread
+    fun dispatchOnBackProgressed(backEvent: BackEvent) {
+        onBackProgressed(backEvent)
+    }
+
+    @RequiresApi(34)
+    @MainThread
+    private fun onBackProgressed(backEvent: BackEvent) {
+        val callback = onBackPressedCallbacks.lastOrNull {
+            it.isEnabled
+        }
+        if (callback != null) {
+            callback.handleOnBackProgressed(backEvent)
+            return
+        }
     }
 
     /**
@@ -216,16 +284,33 @@
         fallbackOnBackPressed?.run()
     }
 
+    @VisibleForTesting
+    @RequiresApi(34)
+    @MainThread
+    fun dispatchOnBackCancelled() {
+        onBackCancelled()
+    }
+
+    @RequiresApi(34)
+    @MainThread
+    private fun onBackCancelled() {
+        val callback = onBackPressedCallbacks.lastOrNull {
+            it.isEnabled
+        }
+        if (callback != null) {
+            callback.handleOnBackCancelled()
+            return
+        }
+    }
+
     private inner class OnBackPressedCancellable(
         private val onBackPressedCallback: OnBackPressedCallback
     ) : Cancellable {
         override fun cancel() {
             onBackPressedCallbacks.remove(onBackPressedCallback)
             onBackPressedCallback.removeCancellable(this)
-            if (Build.VERSION.SDK_INT >= 33) {
-                onBackPressedCallback.enabledChangedCallback = null
-                updateBackInvokedCallbackState()
-            }
+            onBackPressedCallback.enabledChangedCallback?.invoke()
+            onBackPressedCallback.enabledChangedCallback = null
         }
     }
 
@@ -286,6 +371,35 @@
             return OnBackInvokedCallback { onBackInvoked() }
         }
     }
+
+    @RequiresApi(34)
+    internal object Api34Impl {
+        @DoNotInline
+        fun createOnBackAnimationCallback(
+            onBackStarted: (backEvent: BackEvent) -> Unit,
+            onBackProgressed: (backEvent: BackEvent) -> Unit,
+            onBackInvoked: () -> Unit,
+            onBackCancelled: () -> Unit
+        ): OnBackInvokedCallback {
+            return object : OnBackAnimationCallback {
+                override fun onBackStarted(backEvent: BackEvent) {
+                    onBackStarted(backEvent)
+                }
+
+                override fun onBackProgressed(backEvent: BackEvent) {
+                    onBackProgressed(backEvent)
+                }
+
+                override fun onBackInvoked() {
+                    onBackInvoked()
+                }
+
+                override fun onBackCancelled() {
+                    onBackCancelled()
+                }
+            }
+        }
+    }
 }
 
 /**

diff --git a/appactions/interaction/interaction-service/src/test/resources/robolectric.properties b/appactions/interaction/interaction-service/src/test/resources/robolectric.properties
new file mode 100644
index 0000000..69fde47
--- /dev/null
+++ b/appactions/interaction/interaction-service/src/test/resources/robolectric.properties

@@ -0,0 +1,3 @@
+# robolectric properties
+# Temporary until we update Robolectric to support API level 34.
+sdk=33

diff --git a/appcompat/appcompat-resources/api/api_lint.ignore b/appcompat/appcompat-resources/api/api_lint.ignore
index 0cfa261..dd0cf8d 100644
--- a/appcompat/appcompat-resources/api/api_lint.ignore
+++ b/appcompat/appcompat-resources/api/api_lint.ignore

@@ -17,6 +17,8 @@
     Missing nullability on parameter `tint` in method `setTintList`
 MissingNullability: androidx.appcompat.graphics.drawable.DrawableWrapperCompat#DrawableWrapperCompat(android.graphics.drawable.Drawable) parameter #0:
     Missing nullability on parameter `drawable` in method `DrawableWrapperCompat`
+MissingNullability: androidx.appcompat.graphics.drawable.DrawableWrapperCompat#draw(android.graphics.Canvas) parameter #0:
+    Missing nullability on parameter `canvas` in method `draw`
 MissingNullability: androidx.appcompat.graphics.drawable.DrawableWrapperCompat#getCurrent():
     Missing nullability on method `getCurrent` return
 MissingNullability: androidx.appcompat.graphics.drawable.DrawableWrapperCompat#getPadding(android.graphics.Rect) parameter #0:

diff --git a/appcompat/appcompat/api/api_lint.ignore b/appcompat/appcompat/api/api_lint.ignore
index ff1d34f..90541cfd 100644
--- a/appcompat/appcompat/api/api_lint.ignore
+++ b/appcompat/appcompat/api/api_lint.ignore

@@ -91,12 +91,8 @@
     Invalid nullability on parameter `filters` in method `setFilters`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
 InvalidNullabilityOverride: androidx.appcompat.widget.AppCompatToggleButton#setFilters(android.text.InputFilter[]) parameter #0:
     Invalid nullability on parameter `filters` in method `setFilters`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
-InvalidNullabilityOverride: androidx.appcompat.widget.LinearLayoutCompat#onDraw(android.graphics.Canvas) parameter #0:
-    Invalid nullability on parameter `canvas` in method `onDraw`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
 InvalidNullabilityOverride: androidx.appcompat.widget.ListPopupWindow#getListView():
     Invalid nullability on method `getListView` return. Overrides of unannotated super method cannot be Nullable.
-InvalidNullabilityOverride: androidx.appcompat.widget.SwitchCompat#draw(android.graphics.Canvas) parameter #0:
-    Invalid nullability on parameter `c` in method `draw`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
 InvalidNullabilityOverride: androidx.appcompat.widget.SwitchCompat#getCustomSelectionActionModeCallback():
     Invalid nullability on method `getCustomSelectionActionModeCallback` return. Overrides of unannotated super method cannot be Nullable.
 InvalidNullabilityOverride: androidx.appcompat.widget.SwitchCompat#setFilters(android.text.InputFilter[]) parameter #0:
@@ -555,6 +551,8 @@
     Missing nullability on parameter `attrs` in method `createView`
 MissingNullability: androidx.appcompat.graphics.drawable.DrawerArrowDrawable#DrawerArrowDrawable(android.content.Context) parameter #0:
     Missing nullability on parameter `context` in method `DrawerArrowDrawable`
+MissingNullability: androidx.appcompat.graphics.drawable.DrawerArrowDrawable#draw(android.graphics.Canvas) parameter #0:
+    Missing nullability on parameter `canvas` in method `draw`
 MissingNullability: androidx.appcompat.graphics.drawable.DrawerArrowDrawable#getPaint():
     Missing nullability on method `getPaint` return
 MissingNullability: androidx.appcompat.graphics.drawable.DrawerArrowDrawable#setColorFilter(android.graphics.ColorFilter) parameter #0:
@@ -727,6 +725,8 @@
     Missing nullability on parameter `p` in method `generateLayoutParams`
 MissingNullability: androidx.appcompat.widget.LinearLayoutCompat#getDividerDrawable():
     Missing nullability on method `getDividerDrawable` return
+MissingNullability: androidx.appcompat.widget.LinearLayoutCompat#onDraw(android.graphics.Canvas) parameter #0:
+    Missing nullability on parameter `canvas` in method `onDraw`
 MissingNullability: androidx.appcompat.widget.LinearLayoutCompat#onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent) parameter #0:
     Missing nullability on parameter `event` in method `onInitializeAccessibilityEvent`
 MissingNullability: androidx.appcompat.widget.LinearLayoutCompat#onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo) parameter #0:
@@ -797,6 +797,8 @@
     Missing nullability on parameter `source` in method `onShareTargetSelected`
 MissingNullability: androidx.appcompat.widget.ShareActionProvider.OnShareTargetSelectedListener#onShareTargetSelected(androidx.appcompat.widget.ShareActionProvider, android.content.Intent) parameter #1:
     Missing nullability on parameter `intent` in method `onShareTargetSelected`
+MissingNullability: androidx.appcompat.widget.SwitchCompat#draw(android.graphics.Canvas) parameter #0:
+    Missing nullability on parameter `c` in method `draw`
 MissingNullability: androidx.appcompat.widget.SwitchCompat#getTextOff():
     Missing nullability on method `getTextOff` return
 MissingNullability: androidx.appcompat.widget.SwitchCompat#getTextOn():
@@ -831,6 +833,8 @@
     Missing nullability on parameter `thumb` in method `setThumbDrawable`
 MissingNullability: androidx.appcompat.widget.SwitchCompat#setTrackDrawable(android.graphics.drawable.Drawable) parameter #0:
     Missing nullability on parameter `track` in method `setTrackDrawable`
+MissingNullability: androidx.appcompat.widget.SwitchCompat#verifyDrawable(android.graphics.drawable.Drawable) parameter #0:
+    Missing nullability on parameter `who` in method `verifyDrawable`
 MissingNullability: androidx.appcompat.widget.Toolbar#checkLayoutParams(android.view.ViewGroup.LayoutParams) parameter #0:
     Missing nullability on parameter `p` in method `checkLayoutParams`
 MissingNullability: androidx.appcompat.widget.Toolbar#generateDefaultLayoutParams():

diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index dc8d901..61c19d7 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml

@@ -3448,6 +3448,15 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
+        errorLine1="    protected synchronized void onDraw(Canvas canvas) {"
+        errorLine2="                                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatSeekBar.java"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="            int defStyleAttr, int mode, Resources.Theme popupTheme) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~">
         <location
@@ -7111,6 +7120,15 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
+        errorLine1="    protected void onDraw(Canvas canvas) {"
+        errorLine2="                          ~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="    public static TintTypedArray obtainStyledAttributes(Context context, AttributeSet set,"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
@@ -7966,6 +7984,15 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
+        errorLine1="    protected void dispatchDraw(Canvas canvas) {"
+        errorLine2="                                ~~~~~~">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ViewStubCompat.java"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="    public View inflate() {"
         errorLine2="           ~~~~">
         <location

diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesActivityA.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesActivityA.java
index 069c76c..5719451 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesActivityA.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesActivityA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 The Android Open Source Project
+ * Copyright 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,4 +20,3 @@
  * An activity for locales with a unique class name.
  */
 public class LocalesActivityA extends LocalesUpdateActivity {}
-

diff --git a/appintegration/OWNERS b/appintegration/OWNERS
new file mode 100644
index 0000000..c29ded6
--- /dev/null
+++ b/appintegration/OWNERS

@@ -0,0 +1,2 @@
+# Bug component: 1293429
[email protected]

diff --git a/appsearch/appsearch-builtin-types/api/current.txt b/appsearch/appsearch-builtin-types/api/current.txt
index a3244de..1e295d6 100644
--- a/appsearch/appsearch-builtin-types/api/current.txt
+++ b/appsearch/appsearch-builtin-types/api/current.txt

@@ -29,8 +29,10 @@
     ctor public Alarm.Builder(androidx.appsearch.builtintypes.Alarm);
     ctor public Alarm.Builder(String, String);
     method public androidx.appsearch.builtintypes.Alarm.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Alarm.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Alarm build();
     method public androidx.appsearch.builtintypes.Alarm.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Alarm.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodEndDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodStartDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setCreationTimestampMillis(long);
@@ -66,8 +68,10 @@
     ctor public AlarmInstance.Builder(androidx.appsearch.builtintypes.AlarmInstance);
     ctor public AlarmInstance.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.AlarmInstance build();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentScore(int);
@@ -90,8 +94,10 @@
     ctor public ContactPoint.Builder(androidx.appsearch.builtintypes.ContactPoint);
     ctor public ContactPoint.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.ContactPoint.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.ContactPoint build();
     method public androidx.appsearch.builtintypes.ContactPoint.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.ContactPoint.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setAddresses(java.util.List<java.lang.String!>);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setDescription(String?);
@@ -117,8 +123,10 @@
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeyword(androidx.appsearch.builtintypes.properties.Keyword);
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeyword(String);
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeywords(Iterable<androidx.appsearch.builtintypes.properties.Keyword!>);
+    method public androidx.appsearch.builtintypes.ImageObject.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.ImageObject build();
     method public androidx.appsearch.builtintypes.ImageObject.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.ImageObject.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.ImageObject.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.ImageObject.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.ImageObject.Builder setDocumentScore(int);
@@ -159,8 +167,10 @@
     ctor public Person.Builder(androidx.appsearch.builtintypes.Person);
     ctor public Person.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.Person.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Person.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Person build();
     method public androidx.appsearch.builtintypes.Person.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Person.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Person.Builder setAdditionalNames(java.util.List<androidx.appsearch.builtintypes.Person.AdditionalName!>);
     method public androidx.appsearch.builtintypes.Person.Builder setAffiliations(java.util.List<java.lang.String!>);
     method public androidx.appsearch.builtintypes.Person.Builder setBot(boolean);
@@ -182,6 +192,21 @@
     method public androidx.appsearch.builtintypes.Person.Builder setUrl(String?);
   }
 
+  @androidx.appsearch.annotation.Document(name="builtin:PotentialAction") public class PotentialAction {
+    method public String? getDescription();
+    method public String? getName();
+    method public String? getUri();
+  }
+
+  public static final class PotentialAction.Builder {
+    ctor public PotentialAction.Builder();
+    ctor public PotentialAction.Builder(androidx.appsearch.builtintypes.PotentialAction);
+    method public androidx.appsearch.builtintypes.PotentialAction build();
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setDescription(String?);
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setName(String?);
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setUri(String?);
+  }
+
   @androidx.appsearch.annotation.Document(name="builtin:Stopwatch") public class Stopwatch extends androidx.appsearch.builtintypes.Thing {
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedDurationMillis(android.content.Context);
@@ -201,8 +226,10 @@
     ctor public Stopwatch.Builder(androidx.appsearch.builtintypes.Stopwatch);
     ctor public Stopwatch.Builder(String, String);
     method public androidx.appsearch.builtintypes.Stopwatch.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Stopwatch.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Stopwatch build();
     method public androidx.appsearch.builtintypes.Stopwatch.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Stopwatch.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedDurationMillis(long);
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(long, long, int);
@@ -227,8 +254,10 @@
     ctor public StopwatchLap.Builder(androidx.appsearch.builtintypes.StopwatchLap);
     ctor public StopwatchLap.Builder(String, String);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.StopwatchLap.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.StopwatchLap build();
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.StopwatchLap.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapDurationMillis(long);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDescription(String?);
@@ -251,6 +280,7 @@
     method public String? getImage();
     method public String? getName();
     method public String getNamespace();
+    method public java.util.List<androidx.appsearch.builtintypes.PotentialAction!> getPotentialActions();
     method public String? getUrl();
   }
 
@@ -258,8 +288,10 @@
     ctor public Thing.Builder(androidx.appsearch.builtintypes.Thing);
     ctor public Thing.Builder(String, String);
     method public androidx.appsearch.builtintypes.Thing.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Thing.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Thing build();
     method public androidx.appsearch.builtintypes.Thing.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Thing.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Thing.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.Thing.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.Thing.Builder setDocumentScore(int);
@@ -295,8 +327,10 @@
     ctor public Timer.Builder(androidx.appsearch.builtintypes.Timer);
     ctor public Timer.Builder(String, String);
     method public androidx.appsearch.builtintypes.Timer.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Timer.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Timer build();
     method public androidx.appsearch.builtintypes.Timer.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Timer.Builder clearPotentialActions();
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Timer.Builder setBaseTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Timer.Builder setBaseTimeMillis(long, long, int);
     method public androidx.appsearch.builtintypes.Timer.Builder setCreationTimestampMillis(long);

diff --git a/appsearch/appsearch-builtin-types/api/restricted_current.txt b/appsearch/appsearch-builtin-types/api/restricted_current.txt
index a9939c7..e402ed8 100644
--- a/appsearch/appsearch-builtin-types/api/restricted_current.txt
+++ b/appsearch/appsearch-builtin-types/api/restricted_current.txt

@@ -31,8 +31,10 @@
     ctor public Alarm.Builder(androidx.appsearch.builtintypes.Alarm);
     ctor public Alarm.Builder(String, String);
     method public androidx.appsearch.builtintypes.Alarm.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Alarm.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Alarm build();
     method public androidx.appsearch.builtintypes.Alarm.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Alarm.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodEndDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodStartDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setCreationTimestampMillis(long);
@@ -68,8 +70,10 @@
     ctor public AlarmInstance.Builder(androidx.appsearch.builtintypes.AlarmInstance);
     ctor public AlarmInstance.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.AlarmInstance build();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentScore(int);
@@ -92,8 +96,10 @@
     ctor public ContactPoint.Builder(androidx.appsearch.builtintypes.ContactPoint);
     ctor public ContactPoint.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.ContactPoint.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.ContactPoint build();
     method public androidx.appsearch.builtintypes.ContactPoint.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.ContactPoint.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setAddresses(java.util.List<java.lang.String!>);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.ContactPoint.Builder setDescription(String?);
@@ -119,8 +125,10 @@
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeyword(androidx.appsearch.builtintypes.properties.Keyword);
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeyword(String);
     method public androidx.appsearch.builtintypes.ImageObject.Builder addKeywords(Iterable<androidx.appsearch.builtintypes.properties.Keyword!>);
+    method public androidx.appsearch.builtintypes.ImageObject.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.ImageObject build();
     method public androidx.appsearch.builtintypes.ImageObject.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.ImageObject.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.ImageObject.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.ImageObject.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.ImageObject.Builder setDocumentScore(int);
@@ -161,8 +169,10 @@
     ctor public Person.Builder(androidx.appsearch.builtintypes.Person);
     ctor public Person.Builder(String, String, String);
     method public androidx.appsearch.builtintypes.Person.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Person.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Person build();
     method public androidx.appsearch.builtintypes.Person.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Person.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Person.Builder setAdditionalNames(java.util.List<androidx.appsearch.builtintypes.Person.AdditionalName!>);
     method public androidx.appsearch.builtintypes.Person.Builder setAffiliations(java.util.List<java.lang.String!>);
     method public androidx.appsearch.builtintypes.Person.Builder setBot(boolean);
@@ -184,6 +194,21 @@
     method public androidx.appsearch.builtintypes.Person.Builder setUrl(String?);
   }
 
+  @androidx.appsearch.annotation.Document(name="builtin:PotentialAction") public class PotentialAction {
+    method public String? getDescription();
+    method public String? getName();
+    method public String? getUri();
+  }
+
+  public static final class PotentialAction.Builder {
+    ctor public PotentialAction.Builder();
+    ctor public PotentialAction.Builder(androidx.appsearch.builtintypes.PotentialAction);
+    method public androidx.appsearch.builtintypes.PotentialAction build();
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setDescription(String?);
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setName(String?);
+    method public androidx.appsearch.builtintypes.PotentialAction.Builder setUri(String?);
+  }
+
   @androidx.appsearch.annotation.Document(name="builtin:Stopwatch") public class Stopwatch extends androidx.appsearch.builtintypes.Thing {
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedDurationMillis(android.content.Context);
@@ -203,8 +228,10 @@
     ctor public Stopwatch.Builder(androidx.appsearch.builtintypes.Stopwatch);
     ctor public Stopwatch.Builder(String, String);
     method public androidx.appsearch.builtintypes.Stopwatch.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Stopwatch.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Stopwatch build();
     method public androidx.appsearch.builtintypes.Stopwatch.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Stopwatch.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedDurationMillis(long);
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(long, long, int);
@@ -229,8 +256,10 @@
     ctor public StopwatchLap.Builder(androidx.appsearch.builtintypes.StopwatchLap);
     ctor public StopwatchLap.Builder(String, String);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.StopwatchLap.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.StopwatchLap build();
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.StopwatchLap.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapDurationMillis(long);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDescription(String?);
@@ -253,6 +282,7 @@
     method public String? getImage();
     method public String? getName();
     method public String getNamespace();
+    method public java.util.List<androidx.appsearch.builtintypes.PotentialAction!> getPotentialActions();
     method public String? getUrl();
   }
 
@@ -260,8 +290,10 @@
     ctor public Thing.Builder(androidx.appsearch.builtintypes.Thing);
     ctor public Thing.Builder(String, String);
     method public androidx.appsearch.builtintypes.Thing.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Thing.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Thing build();
     method public androidx.appsearch.builtintypes.Thing.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Thing.Builder clearPotentialActions();
     method public androidx.appsearch.builtintypes.Thing.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.Thing.Builder setDescription(String?);
     method public androidx.appsearch.builtintypes.Thing.Builder setDocumentScore(int);
@@ -297,8 +329,10 @@
     ctor public Timer.Builder(androidx.appsearch.builtintypes.Timer);
     ctor public Timer.Builder(String, String);
     method public androidx.appsearch.builtintypes.Timer.Builder addAlternateName(String);
+    method public androidx.appsearch.builtintypes.Timer.Builder addPotentialAction(androidx.appsearch.builtintypes.PotentialAction);
     method public androidx.appsearch.builtintypes.Timer build();
     method public androidx.appsearch.builtintypes.Timer.Builder clearAlternateNames();
+    method public androidx.appsearch.builtintypes.Timer.Builder clearPotentialActions();
     method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Timer.Builder setBaseTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Timer.Builder setBaseTimeMillis(long, long, int);
     method public androidx.appsearch.builtintypes.Timer.Builder setCreationTimestampMillis(long);

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/PotentialActionTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/PotentialActionTest.java
new file mode 100644
index 0000000..a0117d7
--- /dev/null
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/PotentialActionTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.builtintypes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.appsearch.app.GenericDocument;
+
+import org.junit.Test;
+
+public class PotentialActionTest {
+    @Test
+    public void testBuilder() {
+        PotentialAction potentialAction = new PotentialAction.Builder()
+                .setName("actions.intent.CREATE_CALL")
+                .setDescription("Call John")
+                .build();
+
+        assertThat(potentialAction.getName()).isEqualTo("actions.intent.CREATE_CALL");
+        assertThat(potentialAction.getDescription()).isEqualTo("Call John");
+    }
+
+    @Test
+    public void testBuilderCopy_returnsActionWithAllFieldsCopied() {
+        PotentialAction potentialAction1 = new PotentialAction.Builder()
+                .setName("actions.intent.CREATE_CALL")
+                .setDescription("Call John")
+                .build();
+
+        PotentialAction potentialAction2 = new PotentialAction.Builder(potentialAction1).build();
+        assertThat(potentialAction1.getName()).isEqualTo(potentialAction2.getName());
+        assertThat(potentialAction1.getDescription()).isEqualTo(potentialAction2.getDescription());
+        assertThat(potentialAction1.getUri()).isEqualTo(potentialAction2.getUri());
+    }
+
+    @Test
+    public void testActionToGenericDocument() throws Exception {
+        PotentialAction potentialAction = new PotentialAction.Builder()
+                .setName("actions.intent.CREATE_CALL")
+                .setDescription("Call John")
+                .setUri("tel:555-123-4567")
+                .build();
+
+        GenericDocument genericDocument = GenericDocument.fromDocumentClass(potentialAction);
+        assertThat(genericDocument.getSchemaType()).isEqualTo("builtin:PotentialAction");
+        assertThat(genericDocument.getPropertyString("name"))
+                .isEqualTo("actions.intent.CREATE_CALL");
+        assertThat(genericDocument.getPropertyString("description"))
+                .isEqualTo("Call John");
+        assertThat(genericDocument.getPropertyString("uri"))
+                .isEqualTo("tel:555-123-4567");
+    }
+}

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/ThingTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/ThingTest.java
index 9093ced..92198a9 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/ThingTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/ThingTest.java

@@ -23,9 +23,9 @@
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.List;
 
 public class ThingTest {
-
     @Test
     public void testBuilder() {
         long now = System.currentTimeMillis();
@@ -39,6 +39,16 @@
                 .setDescription("this is my first schema.org object")
                 .setImage("content://images/thing1")
                 .setUrl("content://things/1")
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setName("Start Action")
+                        .setDescription("Starts the thing")
+                        .setUri("package://start")
+                        .build())
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setName("Stop Action")
+                        .setDescription("Stops the thing")
+                        .setUri("package://stop")
+                        .build())
                 .build();
 
         assertThat(thing.getNamespace()).isEqualTo("namespace");
@@ -53,6 +63,17 @@
         assertThat(thing.getDescription()).isEqualTo("this is my first schema.org object");
         assertThat(thing.getImage()).isEqualTo("content://images/thing1");
         assertThat(thing.getUrl()).isEqualTo("content://things/1");
+        assertThat(thing.getPotentialActions()).hasSize(2);
+
+        PotentialAction startAction = thing.getPotentialActions().get(0);
+        assertThat(startAction.getName()).isEqualTo("Start Action");
+        assertThat(startAction.getDescription()).isEqualTo("Starts the thing");
+        assertThat(startAction.getUri()).isEqualTo("package://start");
+
+        PotentialAction stopAction = thing.getPotentialActions().get(1);
+        assertThat(stopAction.getName()).isEqualTo("Stop Action");
+        assertThat(stopAction.getDescription()).isEqualTo("Stops the thing");
+        assertThat(stopAction.getUri()).isEqualTo("package://stop");
     }
 
     @Test
@@ -68,6 +89,11 @@
                 .setDescription("this is my first schema.org object")
                 .setImage("content://images/thing1")
                 .setUrl("content://things/1")
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setName("Stop Action")
+                        .setDescription("Stops the thing")
+                        .setUri("package://stop")
+                        .build())
                 .build();
         Thing thing2 = new Thing.Builder(thing1).build();
 
@@ -83,6 +109,12 @@
         assertThat(thing2.getDescription()).isEqualTo("this is my first schema.org object");
         assertThat(thing2.getImage()).isEqualTo("content://images/thing1");
         assertThat(thing2.getUrl()).isEqualTo("content://things/1");
+        assertThat(thing2.getPotentialActions()).isNotNull();
+        assertThat(thing2.getPotentialActions()).hasSize(1);
+        assertThat(thing2.getPotentialActions().get(0).getName()).isEqualTo("Stop Action");
+        assertThat(thing2.getPotentialActions().get(0).getDescription())
+                .isEqualTo("Stops the thing");
+        assertThat(thing2.getPotentialActions().get(0).getUri()).isEqualTo("package://stop");
     }
 
     @Test
@@ -98,11 +130,25 @@
                 .setDescription("this is my first schema.org object")
                 .setImage("content://images/thing1")
                 .setUrl("content://things/1")
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setDescription("View this thing")
+                        .setUri("package://view")
+                        .build())
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setDescription("Edit this thing")
+                        .setUri("package://edit")
+                        .build())
                 .build();
         Thing thing2 = new Thing.Builder(thing1)
                 .clearAlternateNames()
                 .setImage("content://images/thing2")
                 .setUrl("content://things/2")
+                .clearPotentialActions()
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setName("DeleteAction")
+                        .setDescription("Delete this thing")
+                        .setUri("package://delete")
+                        .build())
                 .build();
 
         assertThat(thing2.getNamespace()).isEqualTo("namespace");
@@ -115,11 +161,99 @@
         assertThat(thing2.getDescription()).isEqualTo("this is my first schema.org object");
         assertThat(thing2.getImage()).isEqualTo("content://images/thing2");
         assertThat(thing2.getUrl()).isEqualTo("content://things/2");
+
+        List<PotentialAction> potentialActions = thing2.getPotentialActions();
+        assertThat(potentialActions).hasSize(1);
+        assertThat(potentialActions.get(0).getName()).isEqualTo("DeleteAction");
+        assertThat(potentialActions.get(0).getDescription()).isEqualTo("Delete this thing");
+        assertThat(potentialActions.get(0).getUri()).isEqualTo("package://delete");
     }
 
     @Test
+    public void testBuilderCopy_builderReuse() {
+        long now = System.currentTimeMillis();
+        Thing.Builder builder = new Thing.Builder("namespace", "thing1")
+                .setDocumentScore(1)
+                .setCreationTimestampMillis(now)
+                .setDocumentTtlMillis(30000)
+                .setName("my first thing")
+                .addAlternateName("my first object")
+                .addAlternateName("माझी पहिली गोष्ट")
+                .setDescription("this is my first schema.org object")
+                .setImage("content://images/thing1")
+                .setUrl("content://things/1")
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setDescription("View this thing")
+                        .setUri("package://view")
+                        .build())
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setDescription("Edit this thing")
+                        .setUri("package://edit")
+                        .build());
+
+        Thing thing1 = builder.build();
+
+        builder.clearAlternateNames()
+                .setImage("content://images/thing2")
+                .setUrl("content://things/2")
+                .clearPotentialActions()
+                .addPotentialAction(new PotentialAction.Builder()
+                        .setName("DeleteAction")
+                        .setDescription("Delete this thing")
+                        .setUri("package://delete")
+                        .build());
+
+        Thing thing2 = builder.build();
+
+        // Check that thing1 wasn't altered
+        assertThat(thing1.getNamespace()).isEqualTo("namespace");
+        assertThat(thing1.getId()).isEqualTo("thing1");
+        assertThat(thing1.getDocumentScore()).isEqualTo(1);
+        assertThat(thing1.getCreationTimestampMillis()).isEqualTo(now);
+        assertThat(thing1.getDocumentTtlMillis()).isEqualTo(30000);
+        assertThat(thing1.getName()).isEqualTo("my first thing");
+        assertThat(thing1.getAlternateNames())
+                .containsExactly("my first object", "माझी पहिली गोष्ट");
+        assertThat(thing1.getDescription()).isEqualTo("this is my first schema.org object");
+        assertThat(thing1.getImage()).isEqualTo("content://images/thing1");
+        assertThat(thing1.getUrl()).isEqualTo("content://things/1");
+
+        List<PotentialAction> actions1 = thing1.getPotentialActions();
+        assertThat(actions1).hasSize(2);
+        assertThat(actions1.get(0).getDescription()).isEqualTo("View this thing");
+        assertThat(actions1.get(0).getUri()).isEqualTo("package://view");
+        assertThat(actions1.get(1).getDescription()).isEqualTo("Edit this thing");
+        assertThat(actions1.get(1).getUri()).isEqualTo("package://edit");
+
+        // Check that thing2 has the new values
+        assertThat(thing2.getNamespace()).isEqualTo("namespace");
+        assertThat(thing2.getId()).isEqualTo("thing1");
+        assertThat(thing2.getDocumentScore()).isEqualTo(1);
+        assertThat(thing2.getCreationTimestampMillis()).isEqualTo(now);
+        assertThat(thing2.getDocumentTtlMillis()).isEqualTo(30000);
+        assertThat(thing2.getName()).isEqualTo("my first thing");
+        assertThat(thing2.getAlternateNames()).isEmpty();
+        assertThat(thing2.getDescription()).isEqualTo("this is my first schema.org object");
+        assertThat(thing2.getImage()).isEqualTo("content://images/thing2");
+        assertThat(thing2.getUrl()).isEqualTo("content://things/2");
+
+        List<PotentialAction> actions2 = thing2.getPotentialActions();
+        assertThat(actions2).hasSize(1);
+        assertThat(actions2.get(0).getName()).isEqualTo("DeleteAction");
+        assertThat(actions2.get(0).getDescription()).isEqualTo("Delete this thing");
+        assertThat(actions2.get(0).getUri()).isEqualTo("package://delete");
+    }
+
+
+    @Test
     public void testToGenericDocument() throws Exception {
         long now = System.currentTimeMillis();
+        PotentialAction potentialAction = new PotentialAction.Builder()
+                .setDescription("Make a phone call")
+                .setName("actions.intent.CALL")
+                .setUri("package://call")
+                .build();
+
         Thing thing = new Thing.Builder("namespace", "thing1")
                 .setDocumentScore(1)
                 .setCreationTimestampMillis(now)
@@ -130,6 +264,7 @@
                 .setDescription("this is my first schema.org object")
                 .setImage("content://images/thing1")
                 .setUrl("content://things/1")
+                .addPotentialAction(potentialAction)
                 .build();
 
         GenericDocument document = GenericDocument.fromDocumentClass(thing);
@@ -147,5 +282,12 @@
                 .isEqualTo("this is my first schema.org object");
         assertThat(document.getPropertyString("image")).isEqualTo("content://images/thing1");
         assertThat(document.getPropertyString("url")).isEqualTo("content://things/1");
+
+        assertThat(document.getPropertyString("potentialActions[0].name"))
+                .isEqualTo("actions.intent.CALL");
+        assertThat(document.getPropertyString("potentialActions[0].description"))
+                .isEqualTo("Make a phone call");
+        assertThat(document.getPropertyString("potentialActions[0].uri"))
+                .isEqualTo("package://call");
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java
index da4a47a..4c4a2bb 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java

@@ -65,12 +65,13 @@
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
             @Nullable String image, @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
             boolean enabled, @Nullable int[] daysOfWeek, int hour, int minute,
             @Nullable String blackoutPeriodStartDate, @Nullable String blackoutPeriodEndDate,
             @Nullable String ringtone, boolean shouldVibrate,
             @Nullable AlarmInstance previousInstance, @Nullable AlarmInstance nextInstance) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mEnabled = enabled;
         mDaysOfWeek = daysOfWeek;
         mHour = hour;
@@ -396,6 +397,7 @@
         public Alarm build() {
             return new Alarm(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions,
                     mEnabled, mDaysOfWeek, mHour, mMinute, mBlackoutPeriodStartDate,
                     mBlackoutPeriodEndDate, mRingtone, mShouldVibrate, mPreviousInstance,
                     mNextInstance);

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java
index 59a142a..edab549 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java

@@ -74,10 +74,11 @@
     AlarmInstance(@NonNull String namespace, @NonNull String id, int documentScore,
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
-            @Nullable String image, @Nullable String url, @NonNull String scheduledTime,
+            @Nullable String image, @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions, @NonNull String scheduledTime,
             int status, long snoozeDurationMillis) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mScheduledTime = Preconditions.checkNotNull(scheduledTime);
         mStatus = status;
         mSnoozeDurationMillis = snoozeDurationMillis;
@@ -197,6 +198,7 @@
         public AlarmInstance build() {
             return new AlarmInstance(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions,
                     mScheduledTime, mStatus, mSnoozeDurationMillis);
         }
     }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ContactPoint.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ContactPoint.java
index 84333a6..739e5a6 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ContactPoint.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ContactPoint.java

@@ -57,12 +57,13 @@
             @Nullable String description,
             @Nullable String image,
             @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
             @NonNull String label,
             @NonNull List<String> addresses,
             @NonNull List<String> emails,
             @NonNull List<String> telephones) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mLabel = label;
         mAddresses = Collections.unmodifiableList(addresses);
         mEmails = Collections.unmodifiableList(emails);
@@ -181,6 +182,7 @@
                     /*description=*/ mDescription,
                     /*image=*/ mImage,
                     /*url=*/ mUrl,
+                    /*potentialActions=*/ mPotentialActions,
                     /*label=*/ mLabel,
                     /*addresses=*/ new ArrayList<>(mAddresses),
                     /*emails=*/ new ArrayList<>(mEmails),

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ImageObject.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ImageObject.java
index 2586d9c..b756437 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ImageObject.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/ImageObject.java

@@ -51,10 +51,12 @@
     ImageObject(@NonNull String namespace, @NonNull String id, int documentScore,
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
-            @Nullable String image, @Nullable String url, @NonNull List<Keyword> keywords,
+            @Nullable String image, @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
+            @NonNull List<Keyword> keywords,
             @Nullable String sha256, @Nullable String thumbnailSha256) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mKeywords = checkNotNull(keywords);
         mSha256 = sha256;
         mThumbnailSha256 = thumbnailSha256;
@@ -157,7 +159,7 @@
         public ImageObject build() {
             return new ImageObject(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
-                    new ArrayList<>(mKeywords), mSha256, mThumbnailSha256);
+                    mPotentialActions, new ArrayList<>(mKeywords), mSha256, mThumbnailSha256);
         }
 
         /**

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Person.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Person.java
index bbd50e29..062f799 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Person.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Person.java

@@ -158,6 +158,7 @@
             @Nullable String description,
             @Nullable String image,
             @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
             @Nullable String givenName,
             @Nullable String middleName,
             @Nullable String familyName,
@@ -172,7 +173,7 @@
             @NonNull List<String> relations,
             @NonNull List<ContactPoint> contactPoints) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mGivenName = givenName;
         mMiddleName = middleName;
         mFamilyName = familyName;
@@ -524,6 +525,7 @@
                     /*description=*/ mDescription,
                     /*image=*/ mImage,
                     /*url=*/ mUrl,
+                    /*potentialActions=*/ mPotentialActions,
                     /*givenName=*/ mGivenName,
                     /*middleName=*/ mMiddleName,
                     /*familyName=*/ mFamilyName,

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/PotentialAction.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/PotentialAction.java
new file mode 100644
index 0000000..7d4e7e4
--- /dev/null
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/PotentialAction.java

@@ -0,0 +1,169 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.builtintypes;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appsearch.annotation.Document;
+import androidx.core.util.Preconditions;
+
+/**
+ * An AppSearch document representing an action. This action schema type is used for the nested
+ * potentialActions field in entity schema types such as builtin:Thing or builtin:Timer.
+ *
+ * <ul>
+ * <li><b>name</b> - This is a unique identifier for the action, such as
+ * "actions.intent.CREATE_CALL". See <a
+ * href=developer.android.com/reference/app-actions/built-in-intents/communications/create-call>
+ * developer.android.com/reference/app-actions/built-in-intents/communications/create-call</a>
+ * for an sample Action type.
+ * </li>
+ * <li><b>description</b> - A brief description of what the action does, such as "Create call" or
+ * "Create Message".</li>
+ * <li><b>uri</b> - A deeplink URI linking to an action. Invoking the action can be done by
+ * creating an {@link android.content.Intent} object by calling
+ * {@link android.content.Intent#parseUri} with the deeplink URI. Creating a deeplink URI, and
+ * adding intent extras, can be done by building an intent and calling
+ * {@link android.content.Intent#toUri}.
+ * </li>
+ * </ul>
+ */
+// TODO(b/274671459): Add additional information, if needed, to dispatch actions.
+@Document(name = "builtin:PotentialAction")
+public class PotentialAction {
+    @Document.Namespace
+    final String mNamespace;
+
+    @Document.Id
+    final String mId;
+
+    @Document.StringProperty
+    private final String mName;
+
+    @Document.StringProperty
+    private final String mDescription;
+
+    @Document.StringProperty
+    private final String mUri;
+
+    PotentialAction(@NonNull String namespace, @NonNull String id, @Nullable String name,
+            @Nullable String description, @Nullable String uri) {
+        mNamespace = Preconditions.checkNotNull(namespace);
+        mId = Preconditions.checkNotNull(id);
+        mName = name;
+        mDescription = description;
+        mUri = uri;
+    }
+
+    /** Returns a string describing the action. */
+    @Nullable
+    public String getDescription() {
+        return mDescription;
+    }
+
+    /**
+     * Returns the BII action ID, which comes from Action IDs of Built-in intents listed at <a
+     * href=developer.android.com/reference/app-actions/built-in-intents/bii-index>
+     * developer.android.com/reference/app-actions/built-in-intents/bii-index</a>. For example,
+     * the "Start Exercise" BII has an action id of "actions.intent.START_EXERCISE".
+     */
+    @Nullable
+    public String getName() {
+        return mName;
+    }
+
+    /**
+     * Returns the deeplink URI.
+     *
+     * <p> A deeplink URI is a URI that lets a user access a specific content or feature within an
+     * app directly. Users can create one by adding parameters to the app's base URI. To use a
+     * deeplink URI in an Android application, users can create an {@link android.content.Intent}
+     * object by calling {@link android.content.Intent#parseUri} with the deeplink URI. Creating a
+     * deeplink URI, and adding intent extras, can be done by building an intent and calling
+     * {@link android.content.Intent#toUri}.
+     */
+    @Nullable
+    public String getUri() {
+        return mUri;
+    }
+
+    /** Builder for {@link PotentialAction}. */
+    public static final class Builder {
+        @Nullable private String mName;
+        @Nullable private String mDescription;
+        @Nullable private String mUri;
+
+        /**
+         * Constructor for {@link PotentialAction.Builder}.
+         *
+         * <p> As PotentialAction is used as a DocumentProperty of Thing, it does not need an id or
+         * namespace.
+         */
+        public Builder() { }
+
+        /**
+         * Constructor with all the existing values.
+         *
+         * <p> As PotentialAction is used as a DocumentProperty of Thing, it does not need an id or
+         * namespace.
+         */
+        public Builder(@NonNull PotentialAction potentialAction) {
+            mName = potentialAction.getName();
+            mDescription = potentialAction.getDescription();
+            mUri = potentialAction.getUri();
+        }
+
+        /** Sets the name of the action. */
+        @NonNull
+        public Builder setName(@Nullable String name) {
+            mName = name;
+            return this;
+        }
+
+        /** Sets the description of the action, such as "Call". */
+        @NonNull
+        public Builder setDescription(@Nullable String description) {
+            mDescription = description;
+            return this;
+        }
+
+        /**
+         * Sets the deeplink URI of the Action.
+         *
+         * <p> A deeplink URI is a URI that lets a user access a specific content or feature within
+         * an app directly. Users can create one by adding parameters to the app's base URI. To use
+         * a deeplink URI in an Android application, users can create an
+         * {@link android.content.Intent} object by calling
+         * {@link android.content.Intent#parseUri} with the deeplink URI. Creating a deeplink URI,
+         * and adding intent extras, can be done by building an intent and calling
+         * {@link android.content.Intent#toUri}.
+         */
+        @NonNull
+        public Builder setUri(@Nullable String uri) {
+            mUri = uri;
+            return this;
+        }
+
+        /** Builds the {@link PotentialAction}. */
+        @NonNull
+        public PotentialAction build() {
+            // As PotentialAction is used as a DocumentProperty of Thing, it does not need an id or
+            // namespace.
+            return new PotentialAction(/*namespace=*/"", /*id=*/"", mName, mDescription, mUri);
+        }
+    }
+}

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java
index a3fc290..6c049b8 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java

@@ -77,11 +77,12 @@
     Stopwatch(@NonNull String namespace, @NonNull String id, int documentScore,
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
-            @Nullable String image, @Nullable String url, long baseTimeMillis,
-            long baseTimeMillisInElapsedRealtime, int bootCount, int status,
+            @Nullable String image, @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
+            long baseTimeMillis, long baseTimeMillisInElapsedRealtime, int bootCount, int status,
             long accumulatedDurationMillis, @NonNull List<StopwatchLap> laps) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mBaseTimeMillis = baseTimeMillis;
         mBaseTimeMillisInElapsedRealtime = baseTimeMillisInElapsedRealtime;
         mBootCount = bootCount;
@@ -318,6 +319,7 @@
         public Stopwatch build() {
             return new Stopwatch(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions,
                     mBaseTimeMillis, mBaseTimeMillisInElapsedRealtime, mBootCount, mStatus,
                     mAccumulatedDurationMillis, mLaps);
         }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java
index 1923629..f5b979a 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java

@@ -45,10 +45,11 @@
     StopwatchLap(@NonNull String namespace, @NonNull String id, int documentScore,
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
-            @Nullable String image, @Nullable String url, int lapNumber,
-            long lapDurationMillis, long accumulatedLapDurationMillis) {
+            @Nullable String image, @Nullable String url,
+            @NonNull List<PotentialAction> potentialActions,
+            int lapNumber, long lapDurationMillis, long accumulatedLapDurationMillis) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mLapNumber = lapNumber;
         mLapDurationMillis = lapDurationMillis;
         mAccumulatedLapDurationMillis = accumulatedLapDurationMillis;
@@ -146,6 +147,7 @@
         public StopwatchLap build() {
             return new StopwatchLap(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions,
                     mLapNumber, mLapDurationMillis, mAccumulatedLapDurationMillis);
         }
     }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Thing.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Thing.java
index 58629bc..954e949 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Thing.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Thing.java

@@ -65,10 +65,14 @@
     @Document.StringProperty
     private final String mUrl;
 
+    @Document.DocumentProperty
+    private final List<PotentialAction> mPotentialActions;
+
     Thing(@NonNull String namespace, @NonNull String id, int documentScore,
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
-            @Nullable String image, @Nullable String url) {
+            @Nullable String image, @Nullable String url,
+            @Nullable List<PotentialAction> potentialActions) {
         mNamespace = Preconditions.checkNotNull(namespace);
         mId = Preconditions.checkNotNull(id);
         mDocumentScore = documentScore;
@@ -85,6 +89,13 @@
         mDescription = description;
         mImage = image;
         mUrl = url;
+        // AppSearch may pass null if old schema lacks the potentialActions field during
+        // GenericDocument to Java class conversion.
+        if (potentialActions == null) {
+            mPotentialActions = Collections.emptyList();
+        } else {
+            mPotentialActions = Collections.unmodifiableList(potentialActions);
+        }
     }
 
     /** Returns the namespace (or logical grouping) for this item. */
@@ -154,6 +165,12 @@
         return mUrl;
     }
 
+    /** Returns the actions that can be taken on this object. */
+    @NonNull
+    public List<PotentialAction> getPotentialActions() {
+        return mPotentialActions;
+    }
+
     /** Builder for {@link Thing}. */
     public static final class Builder extends BuilderImpl<Builder> {
         /** Constructs {@link Thing.Builder} with given {@code namespace} and {@code id} */
@@ -181,6 +198,8 @@
         protected String mDescription;
         protected String mImage;
         protected String mUrl;
+        protected List<PotentialAction> mPotentialActions = new ArrayList<>();
+        private boolean mBuilt = false;
 
         BuilderImpl(@NonNull String namespace, @NonNull String id) {
             mNamespace = Preconditions.checkNotNull(namespace);
@@ -201,6 +220,7 @@
             mDescription = thing.getDescription();
             mImage = thing.getImage();
             mUrl = thing.getUrl();
+            mPotentialActions = new ArrayList<>(thing.getPotentialActions());
         }
 
         /**
@@ -214,6 +234,7 @@
         @NonNull
         @SuppressWarnings("unchecked")
         public T setDocumentScore(int documentScore) {
+            resetIfBuilt();
             mDocumentScore = documentScore;
             return (T) this;
         }
@@ -233,6 +254,7 @@
         @NonNull
         @SuppressWarnings("unchecked")
         public T setCreationTimestampMillis(long creationTimestampMillis) {
+            resetIfBuilt();
             mCreationTimestampMillis = creationTimestampMillis;
             return (T) this;
         }
@@ -251,6 +273,7 @@
         @NonNull
         @SuppressWarnings("unchecked")
         public T setDocumentTtlMillis(long documentTtlMillis) {
+            resetIfBuilt();
             mDocumentTtlMillis = documentTtlMillis;
             return (T) this;
         }
@@ -258,6 +281,7 @@
         /** Sets the name of the item. */
         @NonNull
         public T setName(@Nullable String name) {
+            resetIfBuilt();
             mName = name;
             return (T) this;
         }
@@ -265,6 +289,7 @@
         /** Adds an alias for the item. */
         @NonNull
         public T addAlternateName(@NonNull String alternateName) {
+            resetIfBuilt();
             Preconditions.checkNotNull(alternateName);
             mAlternateNames.add(alternateName);
             return (T) this;
@@ -273,6 +298,7 @@
         /** Clears the aliases, if any, for the item. */
         @NonNull
         public T clearAlternateNames() {
+            resetIfBuilt();
             mAlternateNames.clear();
             return (T) this;
         }
@@ -280,6 +306,7 @@
         /** Sets the description for the item. */
         @NonNull
         public T setDescription(@Nullable String description) {
+            resetIfBuilt();
             mDescription = description;
             return (T) this;
         }
@@ -287,6 +314,7 @@
         /** Sets the URL for an image of the item. */
         @NonNull
         public T setImage(@Nullable String image) {
+            resetIfBuilt();
             mImage = image;
             return (T) this;
         }
@@ -307,15 +335,46 @@
          */
         @NonNull
         public T setUrl(@Nullable String url) {
+            resetIfBuilt();
             mUrl = url;
             return (T) this;
         }
+        /**
+         * Add a new action to the list of potential actions for this document.
+         */
+        @NonNull
+        public T addPotentialAction(@NonNull PotentialAction newPotentialAction) {
+            resetIfBuilt();
+            Preconditions.checkNotNull(newPotentialAction);
+            mPotentialActions.add(newPotentialAction);
+            return (T) this;
+        }
+
+        /**
+         * Clear all the potential actions for this document.
+         */
+        @NonNull
+        public T clearPotentialActions() {
+            resetIfBuilt();
+            mPotentialActions.clear();
+            return (T) this;
+        }
+
+        private void resetIfBuilt() {
+            if (mBuilt) {
+                mAlternateNames = new ArrayList<>(mAlternateNames);
+                mPotentialActions = new ArrayList<>(mPotentialActions);
+                mBuilt = false;
+            }
+        }
 
         /** Builds a {@link Thing} object. */
         @NonNull
         public Thing build() {
+            mBuilt = true;
             return new Thing(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
-                    mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl);
+                    mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions);
         }
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
index 11d8961..ef842e4 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java

@@ -91,12 +91,13 @@
             long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
             @Nullable List<String> alternateNames, @Nullable String description,
             @Nullable String image, @Nullable String url,
+            @Nullable List<PotentialAction> potentialActions,
             long durationMillis, long originalDurationMillis, long startTimeMillis,
             long baseTimeMillis, long baseTimeMillisInElapsedRealtime, int bootCount,
             long remainingDurationMillis, @Nullable String ringtone, int status,
             boolean shouldVibrate) {
         super(namespace, id, documentScore, creationTimestampMillis, documentTtlMillis, name,
-                alternateNames, description, image, url);
+                alternateNames, description, image, url, potentialActions);
         mDurationMillis = durationMillis;
         mOriginalDurationMillis = originalDurationMillis;
         mStartTimeMillis = startTimeMillis;
@@ -477,6 +478,7 @@
         public Timer build() {
             return new Timer(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
                     mDocumentTtlMillis, mName, mAlternateNames, mDescription, mImage, mUrl,
+                    mPotentialActions,
                     mDurationMillis, mOriginalDurationMillis, mStartTimeMillis, mBaseTimeMillis,
                     mBaseTimeMillisInElapsedRealtime, mBootCount, mRemainingDurationMillis,
                     mRingtone, mStatus, mShouldVibrate);

diff --git a/appsearch/appsearch-local-storage/proguard-rules.pro b/appsearch/appsearch-local-storage/proguard-rules.pro
index 82c4b719..335e9e8 100644
--- a/appsearch/appsearch-local-storage/proguard-rules.pro
+++ b/appsearch/appsearch-local-storage/proguard-rules.pro

@@ -19,7 +19,7 @@
   <fields>;
 }
 -keep class com.google.android.icing.BreakIteratorBatcher { *; }
--keepclassmembers public class com.google.android.icing.IcingSearchEngine {
+-keepclassmembers public class com.google.android.icing.IcingSearchEngineImpl {
   private long nativePointer;
 }
 

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchImplTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchImplTest.java
index 63bba79..daf7d3a 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchImplTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchImplTest.java

@@ -113,6 +113,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -493,8 +494,8 @@
         InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder();
         mAppSearchImpl.close();
         mAppSearchImpl = AppSearchImpl.create(
-                mAppSearchDir, new UnlimitedLimitConfig(), initStatsBuilder, ALWAYS_OPTIMIZE,
-                /*visibilityChecker=*/null);
+                mAppSearchDir, new UnlimitedLimitConfig(), new DefaultIcingOptionsConfig(),
+                initStatsBuilder, ALWAYS_OPTIMIZE, /*visibilityChecker=*/null);
 
         // Check recovery state
         InitializeStats initStats = initStatsBuilder.build();
@@ -2491,6 +2492,7 @@
         AppSearchImpl appSearchImpl2 = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -2560,6 +2562,7 @@
         AppSearchImpl appSearchImpl2 = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -2636,6 +2639,7 @@
         AppSearchImpl appSearchImpl2 = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -2763,6 +2767,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -2843,6 +2848,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -2901,6 +2907,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -2939,6 +2946,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3053,6 +3061,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3150,6 +3159,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3208,6 +3218,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3328,7 +3339,10 @@
     @Test
     public void testRemoveByQuery_withJoinSpec_throwsException() {
         Exception e = assertThrows(IllegalArgumentException.class,
-                () -> mAppSearchImpl.removeByQuery("", "", "",
+                () -> mAppSearchImpl.removeByQuery(
+                        /*packageName=*/"",
+                        /*databaseName=*/"",
+                        /*queryExpression=*/"",
                         new SearchSpec.Builder()
                                 .setJoinSpec(new JoinSpec.Builder("childProp").build())
                                 .build(),
@@ -3359,6 +3373,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3443,6 +3458,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3501,6 +3517,7 @@
                         return Integer.MAX_VALUE;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3548,6 +3565,7 @@
                         return 2;
                     }
                 },
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
@@ -3649,6 +3667,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -3699,6 +3718,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -3747,6 +3767,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -3797,6 +3818,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -4139,6 +4161,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -4177,6 +4200,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -4207,6 +4231,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -4302,6 +4327,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 tempFolder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 mockVisibilityChecker);
@@ -4388,6 +4414,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 rejectChecker);
@@ -4489,6 +4516,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 visibilityChecker);
@@ -4548,6 +4576,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 rejectChecker);
@@ -4873,6 +4902,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 visibilityChecker);
@@ -5028,6 +5058,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 visibilityChecker);
@@ -5114,6 +5145,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 visibilityChecker);
@@ -5204,6 +5236,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/null,
                 ALWAYS_OPTIMIZE,
                 visibilityChecker);

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchLoggerTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchLoggerTest.java
index bca29e4..c9828f5 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchLoggerTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/AppSearchLoggerTest.java

@@ -22,6 +22,7 @@
 import androidx.appsearch.app.AppSearchSchema;
 import androidx.appsearch.app.GenericDocument;
 import androidx.appsearch.app.InternalSetSchemaResponse;
+import androidx.appsearch.app.JoinSpec;
 import androidx.appsearch.app.SearchResultPage;
 import androidx.appsearch.app.SearchSpec;
 import androidx.appsearch.exceptions.AppSearchException;
@@ -54,6 +55,7 @@
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -74,6 +76,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mTemporaryFolder.newFolder(),
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -348,6 +351,7 @@
         AppSearchImpl appSearchImpl = AppSearchImpl.create(
                 mTemporaryFolder.newFolder(),
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 initStatsBuilder,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -378,6 +382,7 @@
         AppSearchImpl appSearchImpl = AppSearchImpl.create(
                 folder,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
@@ -414,8 +419,8 @@
         // Create another appsearchImpl on the same folder
         InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder();
         appSearchImpl = AppSearchImpl.create(
-                folder, new UnlimitedLimitConfig(), initStatsBuilder, ALWAYS_OPTIMIZE,
-                /*visibilityChecker=*/null);
+                folder, new UnlimitedLimitConfig(), new DefaultIcingOptionsConfig(),
+                initStatsBuilder, ALWAYS_OPTIMIZE, /*visibilityChecker=*/null);
         InitializeStats iStats = initStatsBuilder.build();
 
         assertThat(iStats).isNotNull();
@@ -441,8 +446,8 @@
         final File folder = mTemporaryFolder.newFolder();
 
         AppSearchImpl appSearchImpl = AppSearchImpl.create(
-                folder, new UnlimitedLimitConfig(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
-                /*visibilityChecker=*/null);
+                folder, new UnlimitedLimitConfig(), new DefaultIcingOptionsConfig(),
+                /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE, /*visibilityChecker=*/null);
 
         List<AppSearchSchema> schemas = ImmutableList.of(
                 new AppSearchSchema.Builder("Type1").build(),
@@ -480,8 +485,8 @@
         // Create another appsearchImpl on the same folder
         InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder();
         appSearchImpl = AppSearchImpl.create(
-                folder, new UnlimitedLimitConfig(), initStatsBuilder, ALWAYS_OPTIMIZE,
-                /*visibilityChecker=*/null);
+                folder, new UnlimitedLimitConfig(), new DefaultIcingOptionsConfig(),
+                initStatsBuilder, ALWAYS_OPTIMIZE, /*visibilityChecker=*/null);
         InitializeStats iStats = initStatsBuilder.build();
 
         // Some of other fields are already covered by AppSearchImplTest#testReset()
@@ -708,6 +713,160 @@
     }
 
     @Test
+    public void testLoggingStats_search_join() throws Exception {
+        AppSearchSchema actionSchema = new AppSearchSchema.Builder("ViewAction")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("entityId")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
+                        .setJoinableValueType(AppSearchSchema.StringPropertyConfig
+                                .JOINABLE_VALUE_TYPE_QUALIFIED_ID)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+
+        AppSearchSchema entitySchema = new AppSearchSchema.Builder("entity")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        List<AppSearchSchema> schemas = Arrays.asList(actionSchema, entitySchema);
+
+        // Insert schema
+        final String testPackageName = "testPackage";
+        final String testDatabase = "testDatabase";
+        InternalSetSchemaResponse internalSetSchemaResponse = mAppSearchImpl.setSchema(
+                testPackageName,
+                testDatabase,
+                schemas,
+                /*visibilityDocuments=*/ Collections.emptyList(),
+                /*forceOverride=*/ false,
+                /*version=*/ 0,
+                /* setSchemaStatsBuilder= */ null);
+
+        assertThat(internalSetSchemaResponse.isSuccess()).isTrue();
+        GenericDocument entity1 =
+                new GenericDocument.Builder<>("namespace", "id1", "entity")
+                        .setPropertyString("subject", "an entity")
+                        .build();
+        GenericDocument entity2 =
+                new GenericDocument.Builder<>("namespace", "id2", "entity")
+                        .setPropertyString("subject", "another entity")
+                        .build();
+
+        GenericDocument action1 =
+                new GenericDocument.Builder<>("namespace", "action1", "ViewAction")
+                        .setPropertyString("entityId",
+                                "testPackage$testDatabase/namespace#id1")
+                        .build();
+        GenericDocument action2 =
+                new GenericDocument.Builder<>("namespace", "action2", "ViewAction")
+                        .setPropertyString("entityId",
+                                "testPackage$testDatabase/namespace#id1")
+                        .build();
+        GenericDocument action3 =
+                new GenericDocument.Builder<>("namespace", "action3", "ViewAction")
+                        .setPropertyString("entityId",
+                                "testPackage$testDatabase/namespace#id1")
+                        .build();
+        GenericDocument action4 =
+                new GenericDocument.Builder<>("namespace", "action4", "ViewAction")
+                        .setPropertyString("entityId",
+                                "testPackage$testDatabase/namespace#id2")
+                        .build();
+
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                entity1,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                entity2,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                action1,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                action2,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                action3,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+        mAppSearchImpl.putDocument(
+                testPackageName,
+                testDatabase,
+                action4,
+                /*sendChangeNotifications=*/ false,
+                mLogger);
+
+        SearchSpec nestedSearchSpec =
+                new SearchSpec.Builder()
+                        .setRankingStrategy(SearchSpec.RANKING_STRATEGY_DOCUMENT_SCORE)
+                        .setOrder(SearchSpec.ORDER_ASCENDING)
+                        .build();
+
+        JoinSpec js = new JoinSpec.Builder("entityId")
+                .setNestedSearch("", nestedSearchSpec)
+                .setAggregationScoringStrategy(JoinSpec.AGGREGATION_SCORING_RESULT_COUNT)
+                .build();
+
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_JOIN_AGGREGATE_SCORE)
+                .setJoinSpec(js)
+                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
+                .build();
+
+        String queryStr = "entity";
+        SearchResultPage searchResultPage = mAppSearchImpl.query(testPackageName, testDatabase,
+                queryStr, searchSpec, /*logger=*/ mLogger);
+
+        assertThat(searchResultPage.getResults()).hasSize(2);
+        assertThat(searchResultPage.getResults().get(0).getGenericDocument()).isEqualTo(entity1);
+        assertThat(searchResultPage.getResults().get(1).getGenericDocument()).isEqualTo(entity2);
+
+        SearchStats sStats = mLogger.mSearchStats;
+
+        assertThat(sStats).isNotNull();
+
+        assertThat(sStats.getPackageName()).isEqualTo(testPackageName);
+        assertThat(sStats.getDatabase()).isEqualTo(testDatabase);
+        assertThat(sStats.getStatusCode()).isEqualTo(AppSearchResult.RESULT_OK);
+        assertThat(sStats.getVisibilityScope()).isEqualTo(SearchStats.VISIBILITY_SCOPE_LOCAL);
+        assertThat(sStats.getTermCount()).isEqualTo(1);
+        assertThat(sStats.getQueryLength()).isEqualTo(queryStr.length());
+        assertThat(sStats.getFilteredNamespaceCount()).isEqualTo(1);
+        assertThat(sStats.getFilteredSchemaTypeCount()).isEqualTo(2);
+        assertThat(sStats.getCurrentPageReturnedResultCount()).isEqualTo(2);
+        assertThat(sStats.isFirstPage()).isTrue();
+        assertThat(sStats.getRankingStrategy()).isEqualTo(
+                ScoringSpecProto.RankingStrategy.Code.JOIN_AGGREGATE_SCORE_VALUE);
+        assertThat(sStats.getScoredDocumentCount()).isEqualTo(2);
+        assertThat(sStats.getResultWithSnippetsCount()).isEqualTo(0);
+        // Join-specific stats. If the process goes really fast, the total latency could be 0.
+        // Since the default of total latency is also 0, we just remove the assertion on
+        // JoinLatencyMillis.
+        assertThat(sStats.getJoinType()).isEqualTo(
+                AppSearchSchema.StringPropertyConfig.JOINABLE_VALUE_TYPE_QUALIFIED_ID);
+        assertThat(sStats.getNumJoinedResultsCurrentPage()).isEqualTo(4);
+    }
+
+    @Test
     public void testLoggingStats_remove_success() throws Exception {
         // Insert schema
         final String testPackageName = "testPackage";

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/SearchResultsImplTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/SearchResultsImplTest.java
index dff83a2..6840a98 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/SearchResultsImplTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/SearchResultsImplTest.java

@@ -52,6 +52,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mTemporaryFolder.newFolder(),
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
     }

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverterTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverterTest.java
index 3f2cb70..95cf9c5 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverterTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverterTest.java

@@ -20,6 +20,7 @@
 
 import androidx.appsearch.app.AppSearchSchema;
 
+import com.google.android.icing.proto.JoinableConfig;
 import com.google.android.icing.proto.PropertyConfigProto;
 import com.google.android.icing.proto.SchemaTypeConfigProto;
 import com.google.android.icing.proto.StringIndexingConfig;
@@ -118,4 +119,41 @@
         assertThat(SchemaToProtoConverter.toAppSearchSchema(expectedMusicRecordingProto))
                 .isEqualTo(musicRecordingSchema);
     }
+
+    @Test
+    public void testGetProto_JoinableConfig() {
+        AppSearchSchema albumSchema = new AppSearchSchema.Builder("Album")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("artist")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setJoinableValueType(AppSearchSchema.StringPropertyConfig
+                                .JOINABLE_VALUE_TYPE_QUALIFIED_ID)
+                        .setDeletionPropagation(true)
+                        .build()
+                ).build();
+
+        JoinableConfig joinableConfig = JoinableConfig.newBuilder()
+                .setValueType(JoinableConfig.ValueType.Code.QUALIFIED_ID)
+                .setPropagateDelete(true)
+                .build();
+
+        SchemaTypeConfigProto expectedAlbumProto = SchemaTypeConfigProto.newBuilder()
+                .setSchemaType("Album")
+                .setVersion(0)
+                .addProperties(
+                        PropertyConfigProto.newBuilder()
+                                .setPropertyName("artist")
+                                .setDataType(PropertyConfigProto.DataType.Code.STRING)
+                                .setCardinality(PropertyConfigProto.Cardinality.Code.OPTIONAL)
+                                .setStringIndexingConfig(StringIndexingConfig.newBuilder()
+                                        .setTermMatchType(TermMatchType.Code.UNKNOWN)
+                                        .setTokenizerType(
+                                                StringIndexingConfig.TokenizerType.Code.NONE))
+                                .setJoinableConfig(joinableConfig))
+                .build();
+
+        assertThat(SchemaToProtoConverter.toSchemaTypeConfigProto(albumSchema, /*version=*/0))
+                .isEqualTo(expectedAlbumProto);
+        assertThat(SchemaToProtoConverter.toAppSearchSchema(expectedAlbumProto))
+                .isEqualTo(albumSchema);
+    }
 }

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverterTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverterTest.java
index 271bf2a..b47bd0a 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverterTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverterTest.java

@@ -26,6 +26,8 @@
 import androidx.appsearch.app.JoinSpec;
 import androidx.appsearch.app.SearchSpec;
 import androidx.appsearch.localstorage.AppSearchImpl;
+import androidx.appsearch.localstorage.DefaultIcingOptionsConfig;
+import androidx.appsearch.localstorage.IcingOptionsConfig;
 import androidx.appsearch.localstorage.OptimizeStrategy;
 import androidx.appsearch.localstorage.UnlimitedLimitConfig;
 import androidx.appsearch.localstorage.util.PrefixUtil;
@@ -43,6 +45,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -58,6 +62,26 @@
     @Rule
     public final TemporaryFolder mTemporaryFolder = new TemporaryFolder();
 
+    private final IcingOptionsConfig mDefaultIcingOptionsConfig = new DefaultIcingOptionsConfig();
+
+    private AppSearchImpl mAppSearchImpl;
+
+    @Before
+    public void setUp() throws Exception {
+        mAppSearchImpl = AppSearchImpl.create(
+                mTemporaryFolder.newFolder(),
+                new UnlimitedLimitConfig(),
+                mDefaultIcingOptionsConfig,
+                /*initStatsBuilder=*/ null,
+                ALWAYS_OPTIMIZE,
+                /*visibilityChecker=*/null);
+    }
+
+    @After
+    public void tearDown() {
+        mAppSearchImpl.close();
+    }
+
     @Test
     public void testToSearchSpecProto() throws Exception {
         SearchSpec searchSpec = new SearchSpec.Builder().build();
@@ -70,19 +94,20 @@
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
                 /*namespaceMap=*/ImmutableMap.of(
-                        prefix1, ImmutableSet.of(
-                                prefix1 + "namespace1",
-                                prefix1 + "namespace2"),
-                        prefix2, ImmutableSet.of(
-                                prefix2 + "namespace1",
-                                prefix2 + "namespace2")),
+                prefix1, ImmutableSet.of(
+                        prefix1 + "namespace1",
+                        prefix1 + "namespace2"),
+                prefix2, ImmutableSet.of(
+                        prefix2 + "namespace1",
+                        prefix2 + "namespace2")),
                 /*schemaMap=*/ImmutableMap.of(
-                        prefix1, ImmutableMap.of(
-                                prefix1 + "typeA", configProto,
-                                prefix1 + "typeB", configProto),
-                        prefix2, ImmutableMap.of(
-                                prefix2 + "typeA", configProto,
-                                prefix2 + "typeB", configProto)));
+                prefix1, ImmutableMap.of(
+                        prefix1 + "typeA", configProto,
+                        prefix1 + "typeB", configProto),
+                prefix2, ImmutableMap.of(
+                        prefix2 + "typeA", configProto,
+                        prefix2 + "typeB", configProto)),
+                mDefaultIcingOptionsConfig);
         // Convert SearchSpec to proto.
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
 
@@ -93,6 +118,7 @@
         assertThat(searchSpecProto.getNamespaceFiltersList()).containsExactly(
                 "package$database1/namespace1", "package$database1/namespace2",
                 "package$database2/namespace1", "package$database2/namespace2");
+        assertThat(searchSpecProto.getUseReadOnlySearch()).isTrue();
     }
 
     @Test
@@ -106,7 +132,6 @@
         JoinSpec joinSpec = new JoinSpec.Builder("childPropertyExpression")
                 .setNestedSearch("nestedQuery", nestedSearchSpec)
                 .setAggregationScoringStrategy(JoinSpec.AGGREGATION_SCORING_SUM_RANKING_SIGNAL)
-                .setMaxJoinedResultCount(10)
                 .build();
 
         searchSpec.setJoinSpec(joinSpec);
@@ -131,7 +156,8 @@
                         prefix1 + "typeB", configProto),
                 prefix2, ImmutableMap.of(
                         prefix2 + "typeA", configProto,
-                        prefix2 + "typeB", configProto)));
+                        prefix2 + "typeB", configProto)),
+                mDefaultIcingOptionsConfig);
 
         // Convert SearchSpec to proto.
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
@@ -149,11 +175,10 @@
 
         JoinSpecProto joinSpecProto = searchSpecProto.getJoinSpec();
         assertThat(joinSpecProto.hasNestedSpec()).isTrue();
-        assertThat(joinSpecProto.getParentPropertyExpression()).isEqualTo(JoinSpec.QUALIFIED_ID);
+        assertThat(joinSpecProto.getParentPropertyExpression()).isEqualTo("this.qualifiedId()");
         assertThat(joinSpecProto.getChildPropertyExpression()).isEqualTo("childPropertyExpression");
         assertThat(joinSpecProto.getAggregationScoringStrategy())
                 .isEqualTo(JoinSpecProto.AggregationScoringStrategy.Code.SUM);
-        assertThat(joinSpecProto.getMaxJoinedChildCount()).isEqualTo(10);
 
         JoinSpecProto.NestedSpecProto nestedSpecProto = joinSpecProto.getNestedSpec();
         assertThat(nestedSpecProto.getSearchSpec().getQuery()).isEqualTo("nestedQuery");
@@ -161,6 +186,87 @@
                 ScoringSpecProto.RankingStrategy.Code.CREATION_TIMESTAMP);
     }
 
+    @Test
+    public void testToSearchSpec_withJoinSpec_childSearchesOtherSchema() throws Exception {
+        String prefix1 = PrefixUtil.createPrefix("package", "database1");
+        String prefix2 = PrefixUtil.createPrefix("package", "database2");
+
+        SearchSpec nestedSearchSpec =
+                new SearchSpec.Builder()
+                        .addFilterPackageNames("package")
+                        .addFilterSchemas("typeA")
+                        .build();
+        SearchSpec.Builder searchSpec =
+                new SearchSpec.Builder()
+                        .addFilterPackageNames("package")
+                        .addFilterSchemas("typeB");
+
+        // Create a JoinSpec object and set it in the converter
+        JoinSpec joinSpec =
+                new JoinSpec.Builder("childPropertyExpression")
+                        .setNestedSearch("nestedQuery", nestedSearchSpec)
+                        .build();
+
+        searchSpec.setJoinSpec(joinSpec);
+
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        SearchSpecToProtoConverter converter =
+                new SearchSpecToProtoConverter(
+                        /*queryExpression=*/ "query",
+                        searchSpec.build(),
+                        /*prefixes=*/ ImmutableSet.of(prefix1, prefix2),
+                        /*namespaceMap=*/ ImmutableMap.of(
+                        prefix1,
+                        ImmutableSet.of(
+                                prefix1 + "namespace1", prefix1 + "namespace2"),
+                        prefix2,
+                        ImmutableSet.of(
+                                prefix2 + "namespace1", prefix2 + "namespace2")),
+                        /*schemaMap=*/ ImmutableMap.of(
+                        prefix1,
+                        ImmutableMap.of(
+                                prefix1 + "typeA", configProto,
+                                prefix1 + "typeB", configProto),
+                        prefix2,
+                        ImmutableMap.of(
+                                prefix2 + "typeA", configProto,
+                                prefix2 + "typeB", configProto)),
+                        mDefaultIcingOptionsConfig);
+
+        VisibilityStore visibilityStore = new VisibilityStore(mAppSearchImpl);
+        converter.removeInaccessibleSchemaFilter(
+                new CallerAccess(/*callingPackageName=*/"package"),
+                visibilityStore,
+                AppSearchTestUtils.createMockVisibilityChecker(
+                        /*visiblePrefixedSchemas=*/ ImmutableSet.of(
+                                prefix1 + "typeA", prefix1 + "typeB", prefix2 + "typeA",
+                                prefix2 + "typeB")));
+
+        // Convert SearchSpec to proto.
+        SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
+
+        assertThat(searchSpecProto.getQuery()).isEqualTo("query");
+        assertThat(searchSpecProto.getSchemaTypeFiltersList())
+                .containsExactly(
+                        "package$database1/typeB",
+                        "package$database2/typeB");
+        assertThat(searchSpecProto.getNamespaceFiltersList())
+                .containsExactly(
+                        "package$database1/namespace1", "package$database1/namespace2",
+                        "package$database2/namespace1", "package$database2/namespace2");
+
+        // Assert that the joinSpecProto is set correctly in the searchSpecProto
+        assertThat(searchSpecProto.hasJoinSpec()).isTrue();
+
+        JoinSpecProto joinSpecProto = searchSpecProto.getJoinSpec();
+        assertThat(joinSpecProto.hasNestedSpec()).isTrue();
+
+        JoinSpecProto.NestedSpecProto nestedSpecProto = joinSpecProto.getNestedSpec();
+        assertThat(nestedSpecProto.getSearchSpec().getSchemaTypeFiltersList())
+                .containsExactly(
+                        "package$database1/typeA",
+                        "package$database2/typeA");
+    }
 
     @Test
     public void testToScoringSpecProto() {
@@ -177,7 +283,8 @@
                 searchSpec, /*prefixes=*/ImmutableSet.of(prefix),
                 /*namespaceMap=*/ImmutableMap.of(prefix, ImmutableSet.of(prefix + namespace)),
                 /*schemaMap=*/ImmutableMap.of(prefix, ImmutableMap.of(prefix + schemaType,
-                SchemaTypeConfigProto.getDefaultInstance()))).toScoringSpecProto();
+                SchemaTypeConfigProto.getDefaultInstance())),
+                mDefaultIcingOptionsConfig).toScoringSpecProto();
         TypePropertyWeights typePropertyWeights = TypePropertyWeights.newBuilder()
                 .setSchemaType(prefix + schemaType)
                 .addPropertyWeights(PropertyWeight.newBuilder()
@@ -205,7 +312,8 @@
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(),
                 /*namespaceMap=*/ImmutableMap.of(),
-                /*schemaMap=*/ImmutableMap.of()).toScoringSpecProto();
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig).toScoringSpecProto();
 
         assertThat(scoringSpecProto.getOrderBy().getNumber())
                 .isEqualTo(ScoringSpecProto.Order.Code.ASC_VALUE);
@@ -229,9 +337,11 @@
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(),
                 /*namespaceMap=*/ImmutableMap.of(),
-                /*schemaMap=*/ImmutableMap.of());
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
         ResultSpecProto resultSpecProto = convert.toResultSpecProto(
-                /*namespaceMap=*/ImmutableMap.of());
+                /*namespaceMap=*/ImmutableMap.of(),
+                /*schemaMap=*/ImmutableMap.of());
 
         assertThat(resultSpecProto.getNumPerPage()).isEqualTo(123);
         assertThat(resultSpecProto.getSnippetSpec().getNumToSnippet()).isEqualTo(234);
@@ -240,6 +350,47 @@
     }
 
     @Test
+    public void testToResultSpecProtoWithJoinSpec() throws Exception {
+        SearchSpec nestedSearchSpec = new SearchSpec.Builder()
+                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_CREATION_TIMESTAMP).build();
+
+        // Create a JoinSpec object and set it in the converter
+        JoinSpec joinSpec = new JoinSpec.Builder("childPropertyExpression")
+                .setNestedSearch("nestedQuery", nestedSearchSpec)
+                .setAggregationScoringStrategy(JoinSpec.AGGREGATION_SCORING_SUM_RANKING_SIGNAL)
+                .setMaxJoinedResultCount(10)
+                .build();
+
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_JOIN_AGGREGATE_SCORE)
+                .setJoinSpec(joinSpec)
+                .setResultCountPerPage(123)
+                .setSnippetCount(234)
+                .setSnippetCountPerProperty(345)
+                .setMaxSnippetSize(456)
+                .build();
+
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"query",
+                searchSpec,
+                /*prefixes=*/ImmutableSet.of(),
+                /*namespaceMap=*/ImmutableMap.of(),
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
+
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(
+                /*namespaceMap=*/ImmutableMap.of(),
+                /*schemaMap=*/ImmutableMap.of());
+
+        assertThat(resultSpecProto.getNumPerPage()).isEqualTo(123);
+        assertThat(resultSpecProto.getSnippetSpec().getNumToSnippet()).isEqualTo(234);
+        assertThat(resultSpecProto.getSnippetSpec().getNumMatchesPerProperty()).isEqualTo(345);
+        assertThat(resultSpecProto.getSnippetSpec().getMaxWindowUtf32Length()).isEqualTo(456);
+        assertThat(resultSpecProto.getMaxJoinedChildrenPerParentToReturn()).isEqualTo(10);
+    }
+
+    @Test
     public void testToResultSpecProto_groupByPackage() {
         SearchSpec searchSpec = new SearchSpec.Builder()
                 .setResultGrouping(GROUPING_TYPE_PER_PACKAGE, 5)
@@ -253,7 +404,8 @@
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
                 /*namespaceMap=*/ImmutableMap.of(),
-                /*schemaMap=*/ImmutableMap.of());
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
         ResultSpecProto resultSpecProto = converter.toResultSpecProto(
                 /*namespaceMap=*/ImmutableMap.of(
                         prefix1, ImmutableSet.of(
@@ -261,7 +413,8 @@
                                 prefix1 + "namespaceB"),
                         prefix2, ImmutableSet.of(
                                 prefix2 + "namespaceA",
-                                prefix2 + "namespaceB")));
+                                prefix2 + "namespaceB")),
+                /*schemaMap=*/ImmutableMap.of());
 
         assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(2);
         // First grouping should have same package name.
@@ -304,8 +457,11 @@
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
                 namespaceMap,
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(
+                namespaceMap,
                 /*schemaMap=*/ImmutableMap.of());
-        ResultSpecProto resultSpecProto = converter.toResultSpecProto(namespaceMap);
 
         assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(2);
         // First grouping should have same namespace.
@@ -326,10 +482,57 @@
     }
 
     @Test
+    public void testToResultSpecProto_groupBySchema() throws Exception {
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setResultGrouping(SearchSpec.GROUPING_TYPE_PER_SCHEMA, 5)
+                .build();
+
+        String prefix1 = PrefixUtil.createPrefix("package1", "database");
+        String prefix2 = PrefixUtil.createPrefix("package2", "database");
+
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        Map<String, Map<String, SchemaTypeConfigProto>> schemaMap = ImmutableMap.of(
+                prefix1, ImmutableMap.of(
+                    prefix1 + "typeA", configProto,
+                    prefix1 + "typeB", configProto),
+                prefix2, ImmutableMap.of(
+                    prefix2 + "typeA", configProto,
+                    prefix2 + "typeB", configProto));
+
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"query",
+                searchSpec,
+                /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
+                /*namespaceMap=*/ImmutableMap.of(),
+                schemaMap,
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(
+                /*namespaceMap=*/ImmutableMap.of(),
+                schemaMap);
+
+        assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(2);
+        // First grouping should have the same schema type.
+        ResultSpecProto.ResultGrouping grouping1 = resultSpecProto.getResultGroupings(0);
+        assertThat(grouping1.getEntryGroupingsList()).hasSize(2);
+        assertThat(
+                PrefixUtil.removePrefix(grouping1.getEntryGroupings(0).getSchema()))
+                .isEqualTo(
+                    PrefixUtil.removePrefix(grouping1.getEntryGroupings(1).getSchema()));
+
+        // Second grouping should have the same schema type.
+        ResultSpecProto.ResultGrouping grouping2 = resultSpecProto.getResultGroupings(1);
+        assertThat(grouping2.getEntryGroupingsList()).hasSize(2);
+        assertThat(
+                PrefixUtil.removePrefix(grouping2.getEntryGroupings(0).getSchema()))
+                .isEqualTo(
+                    PrefixUtil.removePrefix(grouping2.getEntryGroupings(1).getSchema()));
+    }
+
+    @Test
     public void testToResultSpecProto_groupByNamespaceAndPackage() throws Exception {
         SearchSpec searchSpec = new SearchSpec.Builder()
                 .setResultGrouping(GROUPING_TYPE_PER_PACKAGE
-                        | SearchSpec.GROUPING_TYPE_PER_NAMESPACE, 5)
+                    | SearchSpec.GROUPING_TYPE_PER_NAMESPACE, 5)
                 .build();
 
         String prefix1 = PrefixUtil.createPrefix("package1", "database");
@@ -346,8 +549,11 @@
                 /*queryExpression=*/"query",
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
-                namespaceMap, /*schemaMap=*/ImmutableMap.of());
-        ResultSpecProto resultSpecProto = converter.toResultSpecProto(namespaceMap);
+                namespaceMap, /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(
+                namespaceMap,
+                /*schemaMap=*/ImmutableMap.of());
 
         // All namespace should be separated.
         assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(4);
@@ -358,6 +564,244 @@
     }
 
     @Test
+    public void testToResultSpecProto_groupBySchemaAndPackage() throws Exception {
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setResultGrouping(GROUPING_TYPE_PER_PACKAGE
+                    | SearchSpec.GROUPING_TYPE_PER_SCHEMA, 5)
+                .build();
+
+        String prefix1 = PrefixUtil.createPrefix("package1", "database");
+        String prefix2 = PrefixUtil.createPrefix("package2", "database");
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        Map<String, Map<String, SchemaTypeConfigProto>> schemaMap = ImmutableMap.of(
+                prefix1, ImmutableMap.of(
+                    prefix1 + "typeA", configProto,
+                    prefix1 + "typeB", configProto),
+                prefix2, ImmutableMap.of(
+                    prefix2 + "typeA", configProto,
+                    prefix2 + "typeB", configProto));
+
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"query",
+                searchSpec,
+                /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
+                /*namespaceMap=*/ImmutableMap.of(),
+                schemaMap,
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(
+                /*namespaceMap=*/ImmutableMap.of(),
+                schemaMap);
+
+        // All schema should be separated.
+        assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(4);
+        assertThat(resultSpecProto.getResultGroupings(0).getEntryGroupingsList()).hasSize(1);
+        assertThat(resultSpecProto.getResultGroupings(1).getEntryGroupingsList()).hasSize(1);
+        assertThat(resultSpecProto.getResultGroupings(2).getEntryGroupingsList()).hasSize(1);
+        assertThat(resultSpecProto.getResultGroupings(3).getEntryGroupingsList()).hasSize(1);
+    }
+
+    @Test
+    public void testToResultSpecProto_groupByNamespaceAndSchema() throws Exception {
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setResultGrouping(SearchSpec.GROUPING_TYPE_PER_NAMESPACE
+                    | SearchSpec.GROUPING_TYPE_PER_SCHEMA, 5)
+                .build();
+
+        String prefix1 = PrefixUtil.createPrefix("package1", "database");
+        String prefix2 = PrefixUtil.createPrefix("package2", "database");
+        Map<String, Set<String>> namespaceMap = /*namespaceMap=*/ImmutableMap.of(
+                prefix1, ImmutableSet.of(
+                    prefix1 + "namespaceA",
+                    prefix1 + "namespaceB"),
+                prefix2, ImmutableSet.of(
+                    prefix2 + "namespaceA",
+                    prefix2 + "namespaceB"));
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        Map<String, Map<String, SchemaTypeConfigProto>> schemaMap = ImmutableMap.of(
+                prefix1, ImmutableMap.of(
+                    prefix1 + "typeA", configProto,
+                    prefix1 + "typeB", configProto),
+                prefix2, ImmutableMap.of(
+                    prefix2 + "typeA", configProto,
+                    prefix2 + "typeB", configProto));
+
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"query",
+                searchSpec,
+                /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
+                namespaceMap,
+                schemaMap,
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(namespaceMap, schemaMap);
+
+        assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(4);
+        ResultSpecProto.ResultGrouping grouping1 = resultSpecProto.getResultGroupings(0);
+        // Each grouping should have a size of 2.
+        assertThat(grouping1.getEntryGroupingsList()).hasSize(2);
+        // Each grouping should have the same namespace and schema type.
+        // Each entry should have the same package and database.
+        assertThat(grouping1.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceA");
+        assertThat(grouping1.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeA");
+        assertThat(grouping1.getEntryGroupings(1).getNamespace())
+                .isEqualTo("package2$database/namespaceA");
+        assertThat(grouping1.getEntryGroupings(1).getSchema())
+                .isEqualTo("package2$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping2 = resultSpecProto.getResultGroupings(1);
+        // Each grouping should have a size of 2.
+        assertThat(grouping2.getEntryGroupingsList()).hasSize(2);
+        // Each grouping should have the same namespace and schema type.
+        // Each entry should have the same package and database.
+        assertThat(grouping2.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceA");
+        assertThat(grouping2.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeB");
+        assertThat(grouping2.getEntryGroupings(1).getNamespace())
+                .isEqualTo("package2$database/namespaceA");
+        assertThat(grouping2.getEntryGroupings(1).getSchema())
+                .isEqualTo("package2$database/typeB");
+
+        ResultSpecProto.ResultGrouping grouping3 = resultSpecProto.getResultGroupings(2);
+        // Each grouping should have a size of 2.
+        assertThat(grouping3.getEntryGroupingsList()).hasSize(2);
+        // Each grouping should have the same namespace and schema type.
+        // Each entry should have the same package and database.
+        assertThat(grouping3.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceB");
+        assertThat(grouping3.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeA");
+        assertThat(grouping3.getEntryGroupings(1).getNamespace())
+                .isEqualTo("package2$database/namespaceB");
+        assertThat(grouping3.getEntryGroupings(1).getSchema())
+                .isEqualTo("package2$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping4 = resultSpecProto.getResultGroupings(3);
+        // Each grouping should have a size of 2.
+        assertThat(grouping4.getEntryGroupingsList()).hasSize(2);
+        // Each grouping should have the same namespace and schema type.
+        // Each entry should have the same package and database.
+        assertThat(grouping4.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceB");
+        assertThat(grouping4.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeB");
+        assertThat(grouping4.getEntryGroupings(1).getNamespace())
+                .isEqualTo("package2$database/namespaceB");
+        assertThat(grouping4.getEntryGroupings(1).getSchema())
+                .isEqualTo("package2$database/typeB");
+    }
+
+    @Test
+    public void testToResultSpecProto_groupByNamespaceAndSchemaAndPackage() throws Exception {
+        SearchSpec searchSpec = new SearchSpec.Builder()
+                .setResultGrouping(SearchSpec.GROUPING_TYPE_PER_PACKAGE
+                    | SearchSpec.GROUPING_TYPE_PER_NAMESPACE
+                    | SearchSpec.GROUPING_TYPE_PER_SCHEMA, 5)
+                .build();
+        String prefix1 = PrefixUtil.createPrefix("package1", "database");
+        String prefix2 = PrefixUtil.createPrefix("package2", "database");
+        Map<String, Set<String>> namespaceMap = /*namespaceMap=*/ImmutableMap.of(
+                prefix1, ImmutableSet.of(
+                    prefix1 + "namespaceA",
+                    prefix1 + "namespaceB"),
+                prefix2, ImmutableSet.of(
+                    prefix2 + "namespaceA",
+                    prefix2 + "namespaceB"));
+        SchemaTypeConfigProto configProto = SchemaTypeConfigProto.getDefaultInstance();
+        Map<String, Map<String, SchemaTypeConfigProto>> schemaMap = ImmutableMap.of(
+                prefix1, ImmutableMap.of(
+                    prefix1 + "typeA", configProto,
+                    prefix1 + "typeB", configProto),
+                prefix2, ImmutableMap.of(
+                    prefix2 + "typeA", configProto,
+                    prefix2 + "typeB", configProto));
+
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"query",
+                searchSpec,
+                /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
+                namespaceMap,
+                schemaMap,
+                mDefaultIcingOptionsConfig);
+        ResultSpecProto resultSpecProto = converter.toResultSpecProto(namespaceMap, schemaMap);
+
+        assertThat(resultSpecProto.getResultGroupingsCount()).isEqualTo(8);
+        ResultSpecProto.ResultGrouping grouping1 = resultSpecProto.getResultGroupings(0);
+        //assertThat(grouping1.getEntryGroupingsList()).containsExactly();
+        // Each grouping should have the size of 1.
+        assertThat(grouping1.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping1.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package2$database/namespaceA");
+        assertThat(grouping1.getEntryGroupings(0).getSchema())
+                .isEqualTo("package2$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping2 = resultSpecProto.getResultGroupings(1);
+        // Each grouping should have the size of 1.
+        assertThat(grouping2.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping2.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package2$database/namespaceA");
+        assertThat(grouping2.getEntryGroupings(0).getSchema())
+                .isEqualTo("package2$database/typeB");
+
+        ResultSpecProto.ResultGrouping grouping3 = resultSpecProto.getResultGroupings(2);
+        // Each grouping should have the size of 1.
+        assertThat(grouping3.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping3.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package2$database/namespaceB");
+        assertThat(grouping3.getEntryGroupings(0).getSchema())
+                .isEqualTo("package2$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping4 = resultSpecProto.getResultGroupings(3);
+        // Each grouping should have the size of 1.
+        assertThat(grouping4.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping4.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package2$database/namespaceB");
+        assertThat(grouping4.getEntryGroupings(0).getSchema())
+                .isEqualTo("package2$database/typeB");
+
+        ResultSpecProto.ResultGrouping grouping5 = resultSpecProto.getResultGroupings(4);
+        // Each grouping should have the size of 1.
+        assertThat(grouping5.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping5.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceA");
+        assertThat(grouping5.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping6 = resultSpecProto.getResultGroupings(5);
+        // Each grouping should have the size of 1.
+        assertThat(grouping6.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping6.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceA");
+        assertThat(grouping6.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeB");
+
+        ResultSpecProto.ResultGrouping grouping7 = resultSpecProto.getResultGroupings(6);
+        // Each grouping should have the size of 1.
+        assertThat(grouping7.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping7.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceB");
+        assertThat(grouping7.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeA");
+
+        ResultSpecProto.ResultGrouping grouping8 = resultSpecProto.getResultGroupings(7);
+        // Each grouping should have the size of 1.
+        assertThat(grouping8.getEntryGroupingsList()).hasSize(1);
+        // Each entry should have the same package.
+        assertThat(grouping8.getEntryGroupings(0).getNamespace())
+                .isEqualTo("package1$database/namespaceB");
+        assertThat(grouping8.getEntryGroupings(0).getSchema())
+                .isEqualTo("package1$database/typeB");
+    }
+
+    @Test
     public void testGetTargetNamespaceFilters_emptySearchingFilter() {
         SearchSpec searchSpec = new SearchSpec.Builder().build();
         String prefix1 = PrefixUtil.createPrefix("package", "database1");
@@ -372,7 +816,8 @@
                 /*queryExpression=*/"",
                 searchSpec,
                 /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
-                namespaceMap, /*schemaMap=*/ImmutableMap.of());
+                namespaceMap, /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
 
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
 
@@ -397,7 +842,8 @@
                         "package$database1/namespace2"),
                 prefix2, ImmutableSet.of("package$database2/namespace3",
                         "package$database2/namespace4")),
-                /*schemaMap=*/ImmutableMap.of());
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
 
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // Only search prefix1 will return namespace 1 and 2.
@@ -419,7 +865,8 @@
                 /*namespaceMap=*/ImmutableMap.of(
                 prefix1, ImmutableSet.of("package$database1/namespace1",
                         "package$database1/namespace2")),
-                /*schemaMap=*/ImmutableMap.of());
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // If the searching namespace filter is not empty, the target namespace filter will be the
         // intersection of the searching namespace filters that users want to search over and
@@ -442,7 +889,8 @@
                 /*namespaceMap=*/ImmutableMap.of(
                 prefix1, ImmutableSet.of("package$database1/namespace1",
                         "package$database1/namespace2")),
-                /*schemaMap=*/ImmutableMap.of());
+                /*schemaMap=*/ImmutableMap.of(),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // If the searching namespace filter is not empty, the target namespace filter will be the
         // intersection of the searching namespace filters that users want to search over and
@@ -469,7 +917,8 @@
                         "package$database1/typeB", schemaTypeConfigProto),
                 prefix2, ImmutableMap.of(
                         "package$database2/typeC", schemaTypeConfigProto,
-                        "package$database2/typeD", schemaTypeConfigProto)));
+                        "package$database2/typeD", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // Empty searching filter will get all types for target filter
         assertThat(searchSpecProto.getSchemaTypeFiltersList()).containsExactly(
@@ -497,7 +946,8 @@
                         "package$database1/typeB", schemaTypeConfigProto),
                 prefix2, ImmutableMap.of(
                         "package$database2/typeC", schemaTypeConfigProto,
-                        "package$database2/typeD", schemaTypeConfigProto)));
+                        "package$database2/typeD", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // Only search prefix1 will return typeA and B.
         assertThat(searchSpecProto.getSchemaTypeFiltersList()).containsExactly(
@@ -521,7 +971,8 @@
                 /*schemaMap=*/ImmutableMap.of(
                 prefix1, ImmutableMap.of(
                         "package$database1/typeA", schemaTypeConfigProto,
-                        "package$database1/typeB", schemaTypeConfigProto)));
+                        "package$database1/typeB", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // If the searching schema filter is not empty, the target schema filter will be the
         // intersection of the schema filters that users want to search over and those candidates
@@ -547,7 +998,8 @@
                 /*schemaMap=*/ImmutableMap.of(
                 prefix1, ImmutableMap.of(
                         "package$database1/typeA", schemaTypeConfigProto,
-                        "package$database1/typeB", schemaTypeConfigProto)));
+                        "package$database1/typeB", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
         SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
         // If there is no intersection of the schema filters that user want to search over and
         // those filters which are stored in AppSearch, return empty.
@@ -556,20 +1008,19 @@
 
     @Test
     public void testRemoveInaccessibleSchemaFilter() throws Exception {
-        AppSearchImpl appSearchImpl = AppSearchImpl.create(
-                mTemporaryFolder.newFolder(),
-                new UnlimitedLimitConfig(),
-                /*initStatsBuilder=*/null,
-                ALWAYS_OPTIMIZE,
-                /*visibilityChecker=*/null);
-        VisibilityStore visibilityStore = new VisibilityStore(appSearchImpl);
+        VisibilityStore visibilityStore = new VisibilityStore(mAppSearchImpl);
 
         final String prefix = PrefixUtil.createPrefix("package", "database");
         SchemaTypeConfigProto schemaTypeConfigProto =
                 SchemaTypeConfigProto.newBuilder().getDefaultInstanceForType();
+
+        SearchSpec nestedSearchSpec = new SearchSpec.Builder().build();
+        JoinSpec joinSpec = new JoinSpec.Builder("entity")
+                .setNestedSearch("", nestedSearchSpec).build();
+
         SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
                 /*queryExpression=*/"",
-                new SearchSpec.Builder().build(),
+                new SearchSpec.Builder().setJoinSpec(joinSpec).build(),
                 /*prefixes=*/ImmutableSet.of(prefix),
                 /*namespaceMap=*/ImmutableMap.of(
                 prefix, ImmutableSet.of("package$database/namespace1")),
@@ -577,7 +1028,8 @@
                 prefix, ImmutableMap.of(
                         "package$database/schema1", schemaTypeConfigProto,
                         "package$database/schema2", schemaTypeConfigProto,
-                        "package$database/schema3", schemaTypeConfigProto)));
+                        "package$database/schema3", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
 
         converter.removeInaccessibleSchemaFilter(
                 new CallerAccess(/*callingPackageName=*/"otherPackageName"),
@@ -590,12 +1042,21 @@
         // schema 2 is filtered out since it is not searchable for user.
         assertThat(searchSpecProto.getSchemaTypeFiltersList()).containsExactly(
                 prefix + "schema1", prefix + "schema3");
+
+        SearchSpecProto nestedSearchProto =
+                searchSpecProto.getJoinSpec().getNestedSpec().getSearchSpec();
+        assertThat(nestedSearchProto.getSchemaTypeFiltersList()).containsExactly(
+                prefix + "schema1", prefix + "schema3");
     }
 
     @Test
     public void testIsNothingToSearch() {
         String prefix = PrefixUtil.createPrefix("package", "database");
+        SearchSpec nestedSearchSpec = new SearchSpec.Builder().build();
+        JoinSpec joinSpec = new JoinSpec.Builder("entity")
+                .setNestedSearch("nested", nestedSearchSpec).build();
         SearchSpec searchSpec = new SearchSpec.Builder()
+                .setJoinSpec(joinSpec)
                 .addFilterSchemas("schema").addFilterNamespaces("namespace").build();
 
         // build maps
@@ -614,7 +1075,8 @@
                         /*queryExpression=*/"",
                         searchSpec, /*prefixes=*/ImmutableSet.of(prefix),
                         /*namespaceMap=*/namespaceMap,
-                        /*schemaMap=*/ImmutableMap.of());
+                        /*schemaMap=*/ImmutableMap.of(),
+                        mDefaultIcingOptionsConfig);
         assertThat(emptySchemaConverter.hasNothingToSearch()).isTrue();
 
         SearchSpecToProtoConverter emptyNamespaceConverter =
@@ -622,14 +1084,16 @@
                         /*queryExpression=*/"",
                         searchSpec, /*prefixes=*/ImmutableSet.of(prefix),
                         /*namespaceMap=*/ImmutableMap.of(),
-                        schemaMap);
+                        schemaMap,
+                        mDefaultIcingOptionsConfig);
         assertThat(emptyNamespaceConverter.hasNothingToSearch()).isTrue();
 
         SearchSpecToProtoConverter nonEmptyConverter =
                 new SearchSpecToProtoConverter(
                         /*queryExpression=*/"",
                         searchSpec, /*prefixes=*/ImmutableSet.of(prefix),
-                        namespaceMap, schemaMap);
+                        namespaceMap, schemaMap,
+                        mDefaultIcingOptionsConfig);
         assertThat(nonEmptyConverter.hasNothingToSearch()).isFalse();
 
         // remove all target schema filter, and the query becomes nothing to search.
@@ -638,6 +1102,49 @@
                 /*visibilityStore=*/null,
                 /*visibilityChecker=*/null);
         assertThat(nonEmptyConverter.hasNothingToSearch()).isTrue();
+        // As the JoinSpec has nothing to search, it should not be part of the SearchSpec
+        assertThat(nonEmptyConverter.toSearchSpecProto().hasJoinSpec()).isFalse();
+    }
+
+    @Test
+    public void testRemoveInaccessibleSchemaFilterWithEmptyNestedFilter() throws Exception {
+        VisibilityStore visibilityStore = new VisibilityStore(mAppSearchImpl);
+
+        final String prefix = PrefixUtil.createPrefix("package", "database");
+        SchemaTypeConfigProto schemaTypeConfigProto =
+                SchemaTypeConfigProto.newBuilder().getDefaultInstanceForType();
+
+        SearchSpec nestedSearchSpec = new SearchSpec.Builder()
+                .addFilterSchemas(ImmutableSet.of(prefix + "schema1", prefix + "schema2"))
+                .build();
+        JoinSpec joinSpec = new JoinSpec.Builder("entity")
+                .setNestedSearch("nested", nestedSearchSpec).build();
+
+        SearchSpecToProtoConverter converter = new SearchSpecToProtoConverter(
+                /*queryExpression=*/"",
+                new SearchSpec.Builder().setJoinSpec(joinSpec).build(),
+                /*prefixes=*/ImmutableSet.of(prefix),
+                /*namespaceMap=*/ImmutableMap.of(
+                prefix, ImmutableSet.of("package$database/namespace1")),
+                /*schemaMap=*/ImmutableMap.of(
+                prefix, ImmutableMap.of(
+                        "package$database/schema1", schemaTypeConfigProto,
+                        "package$database/schema2", schemaTypeConfigProto,
+                        "package$database/schema3", schemaTypeConfigProto)),
+                mDefaultIcingOptionsConfig);
+
+        converter.removeInaccessibleSchemaFilter(
+                new CallerAccess(/*callingPackageName=*/"otherPackageName"),
+                visibilityStore,
+                AppSearchTestUtils.createMockVisibilityChecker(
+                        /*visiblePrefixedSchemas=*/ ImmutableSet.of(prefix + "schema3")));
+
+        SearchSpecProto searchSpecProto = converter.toSearchSpecProto();
+        assertThat(searchSpecProto.getSchemaTypeFiltersList()).containsExactly(prefix + "schema3");
+
+        // Schema 1 and 2 are filtered out of the nested spec. As the JoinSpec has nothing to
+        // search, it should not be part of the SearchSpec.
+        assertThat(searchSpecProto.hasJoinSpec()).isFalse();
     }
 
     @Test
@@ -671,7 +1178,8 @@
                         /*queryExpression=*/"",
                         searchSpec, /*prefixes=*/ImmutableSet.of(prefix1, prefix2),
                         namespaceMap,
-                        schemaTypeMap);
+                        schemaTypeMap,
+                        mDefaultIcingOptionsConfig);
 
         TypePropertyWeights expectedTypePropertyWeight1 =
                 TypePropertyWeights.newBuilder().setSchemaType(prefix1 + schemaTypeA)
@@ -721,7 +1229,8 @@
                         ImmutableSet.of(prefix1 + "namespace1")),
                         /*schemaMap=*/ImmutableMap.of(
                         prefix1,
-                        ImmutableMap.of(prefix1 + "typeA", schemaTypeConfigProto)));
+                        ImmutableMap.of(prefix1 + "typeA", schemaTypeConfigProto)),
+                        mDefaultIcingOptionsConfig);
 
         ScoringSpecProto convertedScoringSpecProto = converter.toScoringSpecProto();
 

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV0Test.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV0Test.java
index fc8d058..167ed1c 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV0Test.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV0Test.java

@@ -32,6 +32,7 @@
 import androidx.appsearch.app.PackageIdentifier;
 import androidx.appsearch.app.VisibilityDocument;
 import androidx.appsearch.localstorage.AppSearchImpl;
+import androidx.appsearch.localstorage.DefaultIcingOptionsConfig;
 import androidx.appsearch.localstorage.OptimizeStrategy;
 import androidx.appsearch.localstorage.UnlimitedLimitConfig;
 import androidx.appsearch.localstorage.util.PrefixUtil;
@@ -127,7 +128,7 @@
         // Persist to disk and re-open the AppSearchImpl
         appSearchImplInV0.close();
         AppSearchImpl appSearchImpl = AppSearchImpl.create(mFile, new UnlimitedLimitConfig(),
-                /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
+                new DefaultIcingOptionsConfig(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
         VisibilityDocument actualDocument1 = new VisibilityDocument(
@@ -159,6 +160,7 @@
                         .build();
         assertThat(actualDocument1).isEqualTo(expectedDocument1);
         assertThat(actualDocument2).isEqualTo(expectedDocument2);
+        appSearchImpl.close();
     }
 
     /** Build AppSearchImpl with deprecated visibility schemas version 0.     */
@@ -192,7 +194,7 @@
                 .build();
         // Set deprecated visibility schema version 0 into AppSearchImpl.
         AppSearchImpl appSearchImpl = AppSearchImpl.create(mFile, new UnlimitedLimitConfig(),
-                /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
+                new DefaultIcingOptionsConfig(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
         InternalSetSchemaResponse internalSetSchemaResponse = appSearchImpl.setSchema(
                 VisibilityStore.VISIBILITY_PACKAGE_NAME,

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV1Test.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV1Test.java
index 37d8fb6..0ca32c0 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV1Test.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreMigrationHelperFromV1Test.java

@@ -27,6 +27,7 @@
 import androidx.appsearch.app.SetSchemaRequest;
 import androidx.appsearch.app.VisibilityDocument;
 import androidx.appsearch.localstorage.AppSearchImpl;
+import androidx.appsearch.localstorage.DefaultIcingOptionsConfig;
 import androidx.appsearch.localstorage.OptimizeStrategy;
 import androidx.appsearch.localstorage.UnlimitedLimitConfig;
 import androidx.appsearch.localstorage.util.PrefixUtil;
@@ -71,7 +72,7 @@
 
         // Create AppSearchImpl with visibility document version 1;
         AppSearchImpl appSearchImplInV1 = AppSearchImpl.create(mFile, new UnlimitedLimitConfig(),
-                /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
+                new DefaultIcingOptionsConfig(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
         InternalSetSchemaResponse internalSetSchemaResponse = appSearchImplInV1.setSchema(
                 VisibilityStore.VISIBILITY_PACKAGE_NAME,
@@ -119,7 +120,7 @@
         // Persist to disk and re-open the AppSearchImpl
         appSearchImplInV1.close();
         AppSearchImpl appSearchImpl = AppSearchImpl.create(mFile, new UnlimitedLimitConfig(),
-                /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
+                new DefaultIcingOptionsConfig(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);
 
         VisibilityDocument actualDocument = new VisibilityDocument(
@@ -140,5 +141,6 @@
                         ImmutableSet.of(SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
                         ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA),
                         ImmutableSet.of(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)));
+        appSearchImpl.close();
     }
 }

diff --git a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreTest.java b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreTest.java
index 0a5364f..99a1ffe 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreTest.java
+++ b/appsearch/appsearch-local-storage/src/androidTest/java/androidx/appsearch/localstorage/visibilitystore/VisibilityStoreTest.java

@@ -26,6 +26,7 @@
 import androidx.appsearch.app.VisibilityDocument;
 import androidx.appsearch.exceptions.AppSearchException;
 import androidx.appsearch.localstorage.AppSearchImpl;
+import androidx.appsearch.localstorage.DefaultIcingOptionsConfig;
 import androidx.appsearch.localstorage.OptimizeStrategy;
 import androidx.appsearch.localstorage.UnlimitedLimitConfig;
 import androidx.appsearch.localstorage.util.PrefixUtil;
@@ -60,6 +61,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 mAppSearchDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 /*initStatsBuilder=*/ null,
                 ALWAYS_OPTIMIZE,
                 /*visibilityChecker=*/null);

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AlwaysSupportedFeatures.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AlwaysSupportedFeatures.java
index 2eba5ee..cf8c77d 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AlwaysSupportedFeatures.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AlwaysSupportedFeatures.java

@@ -48,6 +48,8 @@
                 // fall through
             case Features.LIST_FILTER_QUERY_LANGUAGE:
                 // fall through
+            case Features.SEARCH_SPEC_GROUPING_TYPE_PER_SCHEMA:
+                // fall through
             case Features.SEARCH_RESULT_MATCH_INFO_SUBMATCH:
                 // fall through
             case Features.SEARCH_SPEC_PROPERTY_WEIGHTS:
@@ -55,6 +57,10 @@
             case Features.TOKENIZER_TYPE_RFC822:
                 // fall through
             case Features.SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION:
+                // fall through
+            case Features.SEARCH_SUGGESTION:
+                // fall through
+            case Features.SCHEMA_SET_DELETION_PROPAGATION:
                 return true;
             default:
                 return false;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchImpl.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchImpl.java
index f445af7..04232ce 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchImpl.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchImpl.java

@@ -182,6 +182,7 @@
     private final ReadWriteLock mReadWriteLock = new ReentrantReadWriteLock();
     private final OptimizeStrategy mOptimizeStrategy;
     private final LimitConfig mLimitConfig;
+    private final IcingOptionsConfig mIcingOptionsConfig;
 
     @GuardedBy("mReadWriteLock")
     @VisibleForTesting
@@ -268,12 +269,13 @@
     public static AppSearchImpl create(
             @NonNull File icingDir,
             @NonNull LimitConfig limitConfig,
+            @NonNull IcingOptionsConfig icingOptionsConfig,
             @Nullable InitializeStats.Builder initStatsBuilder,
             @NonNull OptimizeStrategy optimizeStrategy,
             @Nullable VisibilityChecker visibilityChecker)
             throws AppSearchException {
-        return new AppSearchImpl(icingDir, limitConfig, initStatsBuilder, optimizeStrategy,
-                visibilityChecker);
+        return new AppSearchImpl(icingDir, limitConfig, icingOptionsConfig, initStatsBuilder,
+                optimizeStrategy, visibilityChecker);
     }
 
     /**
@@ -282,12 +284,14 @@
     private AppSearchImpl(
             @NonNull File icingDir,
             @NonNull LimitConfig limitConfig,
+            @NonNull IcingOptionsConfig icingOptionsConfig,
             @Nullable InitializeStats.Builder initStatsBuilder,
             @NonNull OptimizeStrategy optimizeStrategy,
             @Nullable VisibilityChecker visibilityChecker)
             throws AppSearchException {
         Preconditions.checkNotNull(icingDir);
         mLimitConfig = Preconditions.checkNotNull(limitConfig);
+        mIcingOptionsConfig = Preconditions.checkNotNull(icingOptionsConfig);
         mOptimizeStrategy = Preconditions.checkNotNull(optimizeStrategy);
         mVisibilityCheckerLocked = visibilityChecker;
 
@@ -296,7 +300,17 @@
             // We synchronize here because we don't want to call IcingSearchEngine.initialize() more
             // than once. It's unnecessary and can be a costly operation.
             IcingSearchEngineOptions options = IcingSearchEngineOptions.newBuilder()
-                    .setBaseDir(icingDir.getAbsolutePath()).build();
+                    .setBaseDir(icingDir.getAbsolutePath())
+                    .setMaxTokenLength(icingOptionsConfig.getMaxTokenLength())
+                    .setIndexMergeSize(icingOptionsConfig.getIndexMergeSize())
+                    .setDocumentStoreNamespaceIdFingerprint(
+                            icingOptionsConfig.getDocumentStoreNamespaceIdFingerprint())
+                    .setOptimizeRebuildIndexThreshold(
+                            icingOptionsConfig.getOptimizeRebuildIndexThreshold())
+                    .setCompressionLevel(icingOptionsConfig.getCompressionLevel())
+                    .setAllowCircularSchemaDefinitions(
+                            icingOptionsConfig.getAllowCircularSchemaDefinitions())
+                    .build();
             LogUtil.piiTrace(TAG, "Constructing IcingSearchEngine, request", options);
             mIcingSearchEngineLocked = new IcingSearchEngine(options);
             LogUtil.piiTrace(
@@ -1327,7 +1341,8 @@
             String prefix = createPrefix(packageName, databaseName);
             SearchSpecToProtoConverter searchSpecToProtoConverter =
                     new SearchSpecToProtoConverter(queryExpression, searchSpec,
-                            Collections.singleton(prefix), mNamespaceMapLocked, mSchemaMapLocked);
+                            Collections.singleton(prefix), mNamespaceMapLocked, mSchemaMapLocked,
+                            mIcingOptionsConfig);
             if (searchSpecToProtoConverter.hasNothingToSearch()) {
                 // there is nothing to search over given their search filters, so we can return an
                 // empty SearchResult and skip sending request to Icing.
@@ -1409,7 +1424,7 @@
             }
             SearchSpecToProtoConverter searchSpecToProtoConverter =
                     new SearchSpecToProtoConverter(queryExpression, searchSpec, prefixFilters,
-                            mNamespaceMapLocked, mSchemaMapLocked);
+                            mNamespaceMapLocked, mSchemaMapLocked, mIcingOptionsConfig);
             // Remove those inaccessible schemas.
             searchSpecToProtoConverter.removeInaccessibleSchemaFilter(
                     callerAccess, mVisibilityStoreLocked, mVisibilityCheckerLocked);
@@ -1450,7 +1465,7 @@
         long rewriteSearchSpecLatencyStartMillis = SystemClock.elapsedRealtime();
         SearchSpecProto finalSearchSpec = searchSpecToProtoConverter.toSearchSpecProto();
         ResultSpecProto finalResultSpec = searchSpecToProtoConverter.toResultSpecProto(
-                mNamespaceMapLocked);
+                mNamespaceMapLocked, mSchemaMapLocked);
         ScoringSpecProto scoringSpec = searchSpecToProtoConverter.toScoringSpecProto();
         if (sStatsBuilder != null) {
             sStatsBuilder.setRewriteSearchSpecLatencyMillis((int)
@@ -1492,6 +1507,10 @@
                 TAG, "search, response", searchResultProto.getResultsCount(), searchResultProto);
         if (sStatsBuilder != null) {
             sStatsBuilder.setStatusCode(statusProtoToResultCode(searchResultProto.getStatus()));
+            if (searchSpec.hasJoinSpec()) {
+                sStatsBuilder.setJoinType(AppSearchSchema.StringPropertyConfig
+                        .JOINABLE_VALUE_TYPE_QUALIFIED_ID);
+            }
             AppSearchLoggerHelper.copyNativeStats(searchResultProto.getQueryStats(), sStatsBuilder);
         }
         checkSuccess(searchResultProto.getStatus());
@@ -1629,6 +1648,8 @@
 
             if (sStatsBuilder != null) {
                 sStatsBuilder.setStatusCode(statusProtoToResultCode(searchResultProto.getStatus()));
+                // Join query stats are handled by SearchResultsImpl, which has access to the
+                // original SearchSpec.
                 AppSearchLoggerHelper.copyNativeStats(searchResultProto.getQueryStats(),
                         sStatsBuilder);
             }
@@ -1868,7 +1889,8 @@
 
             SearchSpecToProtoConverter searchSpecToProtoConverter =
                     new SearchSpecToProtoConverter(queryExpression, searchSpec,
-                            Collections.singleton(prefix), mNamespaceMapLocked, mSchemaMapLocked);
+                            Collections.singleton(prefix), mNamespaceMapLocked, mSchemaMapLocked,
+                            mIcingOptionsConfig);
             if (searchSpecToProtoConverter.hasNothingToSearch()) {
                 // there is nothing to search over given their search filters, so we can return
                 // early and skip sending request to Icing.
@@ -2218,6 +2240,9 @@
         mReadWriteLock.writeLock().lock();
         try {
             throwIfClosedLocked();
+            if (LogUtil.DEBUG) {
+                Log.d(TAG, "Clear data for package: " + packageName);
+            }
             // TODO(b/193494000): We are calling getPackageToDatabases here and in several other
             //  places within AppSearchImpl. This method is not efficient and does a lot of string
             //  manipulation. We should find a way to cache the package to database map so it can

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchLoggerHelper.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchLoggerHelper.java
index 4772afe..0189673 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchLoggerHelper.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/AppSearchLoggerHelper.java

@@ -130,7 +130,10 @@
                 .setJavaToNativeJniLatencyMillis(
                         fromNativeStats.getJavaToNativeJniLatencyMs())
                 .setNativeToJavaJniLatencyMillis(
-                        fromNativeStats.getNativeToJavaJniLatencyMs());
+                        fromNativeStats.getNativeToJavaJniLatencyMs())
+                .setNativeNumJoinedResultsCurrentPage(
+                        fromNativeStats.getNumJoinedResultsReturnedCurrentPage())
+                .setNativeJoinLatencyMillis(fromNativeStats.getJoinLatencyMs());
     }
 
     /**

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/DefaultIcingOptionsConfig.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/DefaultIcingOptionsConfig.java
new file mode 100644
index 0000000..65b10bc
--- /dev/null
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/DefaultIcingOptionsConfig.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// @exportToFramework:copyToPath(testing/testutils/src/android/app/appsearch/testutil/external/DefaultIcingOptionsConfig.java)
+package androidx.appsearch.localstorage;
+
+import androidx.annotation.RestrictTo;
+
+/**
+ * Icing options for AppSearch local-storage. Note, these values are not necessarily the defaults
+ * set in {@link com.google.android.icing.proto.IcingSearchEngineOptions} proto.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class DefaultIcingOptionsConfig implements IcingOptionsConfig {
+    @Override
+    public int getMaxTokenLength() {
+        return DEFAULT_MAX_TOKEN_LENGTH;
+    }
+
+    @Override
+    public int getIndexMergeSize() {
+        return DEFAULT_INDEX_MERGE_SIZE;
+    }
+
+    @Override
+    public boolean getDocumentStoreNamespaceIdFingerprint() {
+        return true;
+    }
+
+    @Override
+    public float getOptimizeRebuildIndexThreshold() {
+        return 0.9f;
+    }
+
+    @Override
+    public int getCompressionLevel() {
+        return DEFAULT_COMPRESSION_LEVEL;
+    }
+
+    @Override
+    public boolean getAllowCircularSchemaDefinitions() {
+        return true;
+    }
+
+    @Override
+    public boolean getUseReadOnlySearch() {
+        return true;
+    }
+}

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/IcingOptionsConfig.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/IcingOptionsConfig.java
new file mode 100644
index 0000000..c64b419
--- /dev/null
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/IcingOptionsConfig.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.localstorage;
+
+import androidx.annotation.RestrictTo;
+
+import com.google.android.icing.proto.IcingSearchEngineOptions;
+
+/**
+ * An interface exposing the optional config flags in {@link IcingSearchEngineOptions} used to
+ * instantiate {@link com.google.android.icing.IcingSearchEngine}, as well as other additional
+ * config flags for IcingSearchEngine.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public interface IcingOptionsConfig {
+    // Defaults from IcingSearchEngineOptions proto
+    int DEFAULT_MAX_TOKEN_LENGTH = 30;
+
+    int DEFAULT_INDEX_MERGE_SIZE = 1048576; // 1 MiB
+
+    boolean DEFAULT_DOCUMENT_STORE_NAMESPACE_ID_FINGERPRINT = false;
+
+    float DEFAULT_OPTIMIZE_REBUILD_INDEX_THRESHOLD = 0.0f;
+
+    /**
+     * The default compression level in IcingSearchEngineOptions proto matches the
+     * previously-hardcoded document compression level in Icing (which is 3).
+     */
+    int DEFAULT_COMPRESSION_LEVEL = 3;
+
+    /**
+     * The maximum allowable token length. All tokens in excess of this size will be truncated to
+     * max_token_length before being indexed.
+     *
+     * <p>Clients may use this option to prevent unnecessary indexing of long tokens.
+     * Depending on the use case, indexing all of
+     * 'Supercalifragilisticexpialidocious' may be unnecessary - a user is
+     * unlikely to type that entire query. So only indexing the first n bytes may
+     * still provide the desired behavior without wasting resources.
+     */
+    int getMaxTokenLength();
+
+    /**
+     * The size (measured in bytes) at which Icing's internal indices should be
+     * merged. Icing buffers changes together before merging them into a more
+     * compact format. When the buffer exceeds index_merge_size during a Put
+     * operation, the buffer is merged into the larger, more compact index.
+     *
+     * <p>This more compact index is more efficient to search over as the index
+     * grows larger and has smaller system health impact.
+     *
+     * <p>Setting a low index_merge_size increases the frequency of merges -
+     * increasing indexing-time latency and flash wear. Setting a high
+     * index_merge_size leads to larger resource usage and higher query latency.
+     */
+    int getIndexMergeSize();
+
+    /**
+     * Whether to use namespace id or namespace name to build up fingerprint for
+     * document_key_mapper_ and corpus_mapper_ in document store.
+     */
+    boolean getDocumentStoreNamespaceIdFingerprint();
+
+    /**
+     * The threshold of the percentage of invalid documents at which to rebuild index
+     * during optimize.
+     *
+     * <p>We rebuild index if and only if |invalid_documents| / |all_documents| >= threshold.
+     *
+     * <p>Rebuilding the index could be faster than optimizing the index if we have
+     * removed most of the documents. Based on benchmarks, 85%~95% seems to be a good threshold
+     * for most cases.
+     */
+    float getOptimizeRebuildIndexThreshold();
+
+    /**
+     * The level of gzip compression for documents in the Icing document store.
+     *
+     * <p>NO_COMPRESSION = 0, BEST_SPEED = 1, BEST_COMPRESSION = 9
+     */
+    int getCompressionLevel();
+
+    /**
+     * Whether to allow circular references between schema types for the schema definition.
+     *
+     * <p>Even when set to true, circular references are still not allowed in the following cases:
+     *   1. All edges of a cycle have index_nested_properties=true
+     *   2. One of the types in the cycle has a joinable property, or depends on a type with a
+     *   joinable property.
+     */
+    boolean getAllowCircularSchemaDefinitions();
+
+    /**
+     * Flag for {@link com.google.android.icing.proto.SearchSpecProto}.
+     *
+     * <p>Whether to use the read-only implementation of IcingSearchEngine::Search.
+     *
+     * <p>The read-only version enables multiple queries to be performed concurrently
+     * as it only acquires the read lock at IcingSearchEngine's level. Finer-grained locks are
+     * implemented around code paths that write changes to Icing during Search.
+     */
+    boolean getUseReadOnlySearch();
+}

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/JetpackOptimizeStrategy.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/JetpackOptimizeStrategy.java
index 6c0ee68..f17b3ce 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/JetpackOptimizeStrategy.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/JetpackOptimizeStrategy.java

@@ -29,7 +29,7 @@
  * @hide
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class JetpackOptimizeStrategy implements OptimizeStrategy{
+public class JetpackOptimizeStrategy implements OptimizeStrategy {
 
     @VisibleForTesting
     static final int DOC_COUNT_OPTIMIZE_THRESHOLD = 1000;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/LocalStorage.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/LocalStorage.java
index b862ce3..758e63b 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/LocalStorage.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/LocalStorage.java

@@ -340,6 +340,7 @@
         mAppSearchImpl = AppSearchImpl.create(
                 icingDir,
                 new UnlimitedLimitConfig(),
+                new DefaultIcingOptionsConfig(),
                 initStatsBuilder,
                 new JetpackOptimizeStrategy(),
                 /*visibilityChecker=*/null);

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/SearchResultsImpl.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/SearchResultsImpl.java
index 8da40bb..11b4813 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/SearchResultsImpl.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/SearchResultsImpl.java

@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appsearch.app.AppSearchSchema;
 import androidx.appsearch.app.SearchResult;
 import androidx.appsearch.app.SearchResultPage;
 import androidx.appsearch.app.SearchResults;
@@ -114,6 +115,11 @@
                 searchResultPage = mAppSearchImpl.getNextPage(mPackageName, mNextPageToken,
                         sStatsBuilder);
                 if (mLogger != null && sStatsBuilder != null) {
+                    if (mSearchSpec.getJoinSpec() != null
+                            && !mSearchSpec.getJoinSpec().getChildPropertyExpression().isEmpty()) {
+                        sStatsBuilder.setJoinType(AppSearchSchema.StringPropertyConfig
+                                .JOINABLE_VALUE_TYPE_QUALIFIED_ID);
+                    }
                     mLogger.logStats(sStatsBuilder.build());
                 }
             }

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/UnlimitedLimitConfig.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/UnlimitedLimitConfig.java
index b4f37fa..a402969 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/UnlimitedLimitConfig.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/UnlimitedLimitConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+// @exportToFramework:copyToPath(testing/testutils/src/android/app/appsearch/testutil/external/UnlimitedLimitConfig.java)
 package androidx.appsearch.localstorage;
 
 import androidx.annotation.RestrictTo;
@@ -22,7 +22,6 @@
  * In Jetpack, AppSearch doesn't enforce artificial limits on number of documents or size of
  * documents, since the app is the only user of the Icing instance. Icing still enforces a docid
  * limit of 1M docs.
- * @hide
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class UnlimitedLimitConfig implements LimitConfig {

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverter.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverter.java
index b22d33f..976f0aa 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverter.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SchemaToProtoConverter.java

@@ -99,6 +99,7 @@
                         .setValueType(
                                 convertJoinableValueTypeToProto(
                                         stringProperty.getJoinableValueType()))
+                        .setPropagateDelete(stringProperty.getDeletionPropagation())
                         .build();
                 builder.setJoinableConfig(joinableConfig);
             }
@@ -188,6 +189,7 @@
                         .setJoinableValueType(
                                 convertJoinableValueTypeFromProto(
                                         proto.getJoinableConfig().getValueType()))
+                        .setDeletionPropagation(proto.getJoinableConfig().getPropagateDelete())
                         .setTokenizerType(
                                 proto.getStringIndexingConfig().getTokenizerType().getNumber());
 

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverter.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverter.java
index 0e80ebe..61e919b 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverter.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/converter/SearchSpecToProtoConverter.java

@@ -18,6 +18,7 @@
 
 import static androidx.appsearch.localstorage.util.PrefixUtil.createPrefix;
 import static androidx.appsearch.localstorage.util.PrefixUtil.getPackageName;
+import static androidx.appsearch.localstorage.util.PrefixUtil.getPrefix;
 import static androidx.appsearch.localstorage.util.PrefixUtil.removePrefix;
 
 import android.util.Log;
@@ -26,8 +27,10 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.appsearch.app.JoinSpec;
+import androidx.appsearch.app.SearchResult;
 import androidx.appsearch.app.SearchSpec;
 import androidx.appsearch.exceptions.AppSearchException;
+import androidx.appsearch.localstorage.IcingOptionsConfig;
 import androidx.appsearch.localstorage.visibilitystore.CallerAccess;
 import androidx.appsearch.localstorage.visibilitystore.VisibilityChecker;
 import androidx.appsearch.localstorage.visibilitystore.VisibilityStore;
@@ -79,6 +82,7 @@
      * filters which are stored in AppSearch. This is a field so that we can generate nested protos.
      */
     private final Map<String, Set<String>> mNamespaceMap;
+
     /**
      *The cached Map of {@code <Prefix, Map<PrefixedSchemaType, schemaProto>>} stores all
      * prefixed schema filters which are stored inAppSearch. This is a field so that we can
@@ -87,6 +91,18 @@
     private final Map<String, Map<String, SchemaTypeConfigProto>> mSchemaMap;
 
     /**
+     * Optional config flags in {@link SearchSpecProto}.
+     */
+    private final IcingOptionsConfig mIcingOptionsConfig;
+
+    /**
+     * The nested converter, which contains SearchSpec, ResultSpec, and ScoringSpec information
+     * about the nested query. This will remain null if there is no nested {@link JoinSpec}.
+     */
+    @Nullable
+    private SearchSpecToProtoConverter mNestedConverter = null;
+
+    /**
      * Creates a {@link SearchSpecToProtoConverter} for given {@link SearchSpec}.
      *
      * @param queryExpression                Query String to search.
@@ -102,12 +118,14 @@
             @NonNull SearchSpec searchSpec,
             @NonNull Set<String> prefixes,
             @NonNull Map<String, Set<String>> namespaceMap,
-            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap) {
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap,
+            @NonNull IcingOptionsConfig icingOptionsConfig) {
         mQueryExpression = Preconditions.checkNotNull(queryExpression);
         mSearchSpec = Preconditions.checkNotNull(searchSpec);
         mPrefixes = Preconditions.checkNotNull(prefixes);
         mNamespaceMap = Preconditions.checkNotNull(namespaceMap);
         mSchemaMap = Preconditions.checkNotNull(schemaMap);
+        mIcingOptionsConfig = Preconditions.checkNotNull(icingOptionsConfig);
         mTargetPrefixedNamespaceFilters =
                 SearchSpecToProtoConverterUtil.generateTargetNamespaceFilters(
                         prefixes, namespaceMap, searchSpec.getFilterNamespaces());
@@ -120,11 +138,28 @@
         } else {
             mTargetPrefixedSchemaFilters = new ArraySet<>();
         }
+
+        JoinSpec joinSpec = searchSpec.getJoinSpec();
+        if (joinSpec == null) {
+            return;
+        }
+
+        mNestedConverter = new SearchSpecToProtoConverter(
+                joinSpec.getNestedQuery(),
+                joinSpec.getNestedSearchSpec(),
+                mPrefixes,
+                namespaceMap,
+                schemaMap,
+                mIcingOptionsConfig);
     }
 
     /**
      * @return whether this search's target filters are empty. If any target filter is empty, we
      * should skip send request to Icing.
+     *
+     * <p> The nestedConverter is not checked as {@link SearchResult}s from the nested query have
+     * to be joined to a {@link SearchResult} from the parent query. If the parent query has
+     * nothing to search, then so does the child query.
      */
     public boolean hasNothingToSearch() {
         return mTargetPrefixedNamespaceFilters.isEmpty() || mTargetPrefixedSchemaFilters.isEmpty();
@@ -146,23 +181,68 @@
             @NonNull CallerAccess callerAccess,
             @Nullable VisibilityStore visibilityStore,
             @Nullable VisibilityChecker visibilityChecker) {
+        removeInaccessibleSchemaFilterCached(callerAccess, visibilityStore,
+                /*inaccessibleSchemaPrefixes=*/new ArraySet<>(),
+                /*accessibleSchemaPrefixes=*/new ArraySet<>(), visibilityChecker);
+    }
+
+    /**
+     * For each target schema, we will check visibility store is that accessible to the caller. And
+     * remove this schemas if it is not allowed for caller to query. This private version accepts
+     * two additional parameters to minimize the amount of calls to
+     * {@link VisibilityUtil#isSchemaSearchableByCaller}.
+     *
+     * @param callerAccess      Visibility access info of the calling app
+     * @param visibilityStore   The {@link VisibilityStore} that store all visibility
+     *                          information.
+     * @param visibilityChecker Optional visibility checker to check whether the caller
+     *                          could access target schemas. Pass {@code null} will
+     *                          reject access for all documents which doesn't belong
+     *                          to the calling package.
+     * @param inaccessibleSchemaPrefixes A set of schemas that are known to be inaccessible. This
+     *                                  is helpful for reducing duplicate calls to
+     *                                  {@link VisibilityUtil}.
+     * @param accessibleSchemaPrefixes A set of schemas that are known to be accessible. This is
+     *                                 helpful for reducing duplicate calls to
+     *                                 {@link VisibilityUtil}.
+     */
+    private void removeInaccessibleSchemaFilterCached(
+            @NonNull CallerAccess callerAccess,
+            @Nullable VisibilityStore visibilityStore,
+            @NonNull Set<String> inaccessibleSchemaPrefixes,
+            @NonNull Set<String> accessibleSchemaPrefixes,
+            @Nullable VisibilityChecker visibilityChecker) {
         Iterator<String> targetPrefixedSchemaFilterIterator =
                 mTargetPrefixedSchemaFilters.iterator();
         while (targetPrefixedSchemaFilterIterator.hasNext()) {
             String targetPrefixedSchemaFilter = targetPrefixedSchemaFilterIterator.next();
             String packageName = getPackageName(targetPrefixedSchemaFilter);
 
-            if (!VisibilityUtil.isSchemaSearchableByCaller(
+            if (accessibleSchemaPrefixes.contains(targetPrefixedSchemaFilter)) {
+                continue;
+            } else if (inaccessibleSchemaPrefixes.contains(targetPrefixedSchemaFilter)) {
+                targetPrefixedSchemaFilterIterator.remove();
+            } else if (!VisibilityUtil.isSchemaSearchableByCaller(
                     callerAccess,
                     packageName,
                     targetPrefixedSchemaFilter,
                     visibilityStore,
                     visibilityChecker)) {
                 targetPrefixedSchemaFilterIterator.remove();
+                inaccessibleSchemaPrefixes.add(targetPrefixedSchemaFilter);
+            } else {
+                accessibleSchemaPrefixes.add(targetPrefixedSchemaFilter);
             }
         }
+
+        if (mNestedConverter != null) {
+            mNestedConverter.removeInaccessibleSchemaFilterCached(
+                    callerAccess, visibilityStore, inaccessibleSchemaPrefixes,
+                    accessibleSchemaPrefixes, visibilityChecker);
+        }
     }
 
+
     /** Extracts {@link SearchSpecProto} information from a {@link SearchSpec}. */
     @NonNull
     public SearchSpecProto toSearchSpecProto() {
@@ -172,7 +252,8 @@
         SearchSpecProto.Builder protoBuilder = SearchSpecProto.newBuilder()
                 .setQuery(mQueryExpression)
                 .addAllNamespaceFilters(mTargetPrefixedNamespaceFilters)
-                .addAllSchemaTypeFilters(mTargetPrefixedSchemaFilters);
+                .addAllSchemaTypeFilters(mTargetPrefixedSchemaFilters)
+                .setUseReadOnlySearch(mIcingOptionsConfig.getUseReadOnlySearch());
 
         @SearchSpec.TermMatch int termMatchCode = mSearchSpec.getTermMatch();
         TermMatchType.Code termMatchCodeProto = TermMatchType.Code.forNumber(termMatchCode);
@@ -181,25 +262,25 @@
         }
         protoBuilder.setTermMatchType(termMatchCodeProto);
 
-        JoinSpec joinSpec = mSearchSpec.getJoinSpec();
-        if (joinSpec != null) {
-            SearchSpecToProtoConverter nestedConverter = new SearchSpecToProtoConverter(
-                    joinSpec.getNestedQuery(), joinSpec.getNestedSearchSpec(), mPrefixes,
-                    mNamespaceMap, mSchemaMap);
+        if (mNestedConverter != null && !mNestedConverter.hasNothingToSearch()) {
+            JoinSpecProto.NestedSpecProto nestedSpec =
+                    JoinSpecProto.NestedSpecProto.newBuilder()
+                            .setResultSpec(mNestedConverter.toResultSpecProto(
+                                    mNamespaceMap, mSchemaMap))
+                            .setScoringSpec(mNestedConverter.toScoringSpecProto())
+                            .setSearchSpec(mNestedConverter.toSearchSpecProto())
+                            .build();
 
-            JoinSpecProto.NestedSpecProto nestedSpec = JoinSpecProto.NestedSpecProto.newBuilder()
-                    .setResultSpec(nestedConverter.toResultSpecProto(mNamespaceMap))
-                    .setScoringSpec(nestedConverter.toScoringSpecProto())
-                    .setSearchSpec(nestedConverter.toSearchSpecProto())
-                    .build();
-
-            JoinSpecProto.Builder joinSpecProtoBuilder = JoinSpecProto.newBuilder()
-                    .setNestedSpec(nestedSpec)
-                    .setParentPropertyExpression(JoinSpec.QUALIFIED_ID)
-                    .setChildPropertyExpression(joinSpec.getChildPropertyExpression())
-                    .setAggregationScoringStrategy(
-                            toAggregationScoringStrategy(joinSpec.getAggregationScoringStrategy()))
-                    .setMaxJoinedChildCount(joinSpec.getMaxJoinedResultCount());
+            // This cannot be null, otherwise mNestedConverter would be null as well.
+            JoinSpec joinSpec = mSearchSpec.getJoinSpec();
+            JoinSpecProto.Builder joinSpecProtoBuilder =
+                    JoinSpecProto.newBuilder()
+                            .setNestedSpec(nestedSpec)
+                            .setParentPropertyExpression(JoinSpec.QUALIFIED_ID)
+                            .setChildPropertyExpression(joinSpec.getChildPropertyExpression())
+                            .setAggregationScoringStrategy(
+                                    toAggregationScoringStrategy(
+                                            joinSpec.getAggregationScoringStrategy()));
 
             protoBuilder.setJoinSpec(joinSpecProtoBuilder);
         }
@@ -252,10 +333,14 @@
      *
      * @param namespaceMap    The cached Map of {@code <Prefix, Set<PrefixedNamespace>>} stores
      *                        all existing prefixed namespace.
+     * @param schemaMap       The cached Map of {@code <Prefix, Map<PrefixedSchemaType,
+     *                        schemaProto>>} stores all prefixed schema filters which are stored
+     *                        inAppSearch.
      */
     @NonNull
     public ResultSpecProto toResultSpecProto(
-            @NonNull Map<String, Set<String>> namespaceMap) {
+            @NonNull Map<String, Set<String>> namespaceMap,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap) {
         ResultSpecProto.Builder resultSpecBuilder = ResultSpecProto.newBuilder()
                 .setNumPerPage(mSearchSpec.getResultCountPerPage())
                 .setSnippetSpec(
@@ -263,6 +348,11 @@
                                 .setNumToSnippet(mSearchSpec.getSnippetCount())
                                 .setNumMatchesPerProperty(mSearchSpec.getSnippetCountPerProperty())
                                 .setMaxWindowUtf32Length(mSearchSpec.getMaxSnippetSize()));
+        JoinSpec joinSpec = mSearchSpec.getJoinSpec();
+        if (joinSpec != null) {
+            resultSpecBuilder.setMaxJoinedChildrenPerParentToReturn(
+                    joinSpec.getMaxJoinedResultCount());
+        }
 
         // Rewrites the typePropertyMasks that exist in {@code prefixes}.
         int groupingType = mSearchSpec.getResultGroupingTypeFlags();
@@ -279,12 +369,36 @@
                         namespaceMap, resultSpecBuilder);
                 resultGroupingType = ResultSpecProto.ResultGroupingType.NAMESPACE;
                 break;
+            case SearchSpec.GROUPING_TYPE_PER_SCHEMA:
+                addPerSchemaResultGrouping(mPrefixes, mSearchSpec.getResultGroupingLimit(),
+                        schemaMap, resultSpecBuilder);
+                resultGroupingType = ResultSpecProto.ResultGroupingType.SCHEMA_TYPE;
+                break;
             case SearchSpec.GROUPING_TYPE_PER_PACKAGE | SearchSpec.GROUPING_TYPE_PER_NAMESPACE:
                 addPerPackagePerNamespaceResultGroupings(mPrefixes,
                         mSearchSpec.getResultGroupingLimit(),
                         namespaceMap, resultSpecBuilder);
                 resultGroupingType = ResultSpecProto.ResultGroupingType.NAMESPACE;
                 break;
+            case SearchSpec.GROUPING_TYPE_PER_PACKAGE | SearchSpec.GROUPING_TYPE_PER_SCHEMA:
+                addPerPackagePerSchemaResultGroupings(mPrefixes,
+                        mSearchSpec.getResultGroupingLimit(),
+                        schemaMap, resultSpecBuilder);
+                resultGroupingType = ResultSpecProto.ResultGroupingType.SCHEMA_TYPE;
+                break;
+            case SearchSpec.GROUPING_TYPE_PER_NAMESPACE | SearchSpec.GROUPING_TYPE_PER_SCHEMA:
+                addPerNamespaceAndSchemaResultGrouping(mPrefixes,
+                        mSearchSpec.getResultGroupingLimit(),
+                        namespaceMap, schemaMap, resultSpecBuilder);
+                resultGroupingType = ResultSpecProto.ResultGroupingType.NAMESPACE_AND_SCHEMA_TYPE;
+                break;
+            case SearchSpec.GROUPING_TYPE_PER_PACKAGE | SearchSpec.GROUPING_TYPE_PER_NAMESPACE
+                | SearchSpec.GROUPING_TYPE_PER_SCHEMA:
+                addPerPackagePerNamespacePerSchemaResultGrouping(mPrefixes,
+                        mSearchSpec.getResultGroupingLimit(),
+                        namespaceMap, schemaMap, resultSpecBuilder);
+                resultGroupingType = ResultSpecProto.ResultGroupingType.NAMESPACE_AND_SCHEMA_TYPE;
+                break;
             default:
                 break;
         }
@@ -363,21 +477,54 @@
     }
 
     /**
-     * Adds result groupings for each namespace in each package being queried for.
+     * Returns a Map of namespace to prefixedNamespaces. This is NOT necessarily the
+     * same as the list of namespaces. If a namespace exists under different packages and/or
+     * different databases, they should still be grouped together.
      *
-     * @param prefixes          Prefixes that we should prepend to all our filters
-     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param prefixes          Prefixes that we should prepend to all our filters.
      * @param namespaceMap      The namespace map contains all prefixed existing namespaces.
-     * @param resultSpecBuilder ResultSpecs as specified by client
      */
-    private static void addPerPackagePerNamespaceResultGroupings(
+    private static Map<String, List<String>> getNamespaceToPrefixedNamespaces(
             @NonNull Set<String> prefixes,
-            int maxNumResults,
-            @NonNull Map<String, Set<String>> namespaceMap,
-            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
-        // Create a map for package+namespace to prefixedNamespaces. This is NOT necessarily the
-        // same as the list of namespaces. If one package has multiple databases, each with the same
-        // namespace, then those should be grouped together.
+            @NonNull Map<String, Set<String>> namespaceMap) {
+        Map<String, List<String>> namespaceToPrefixedNamespaces = new ArrayMap<>();
+        for (String prefix : prefixes) {
+            Set<String> prefixedNamespaces = namespaceMap.get(prefix);
+            if (prefixedNamespaces == null) {
+                continue;
+            }
+            for (String prefixedNamespace : prefixedNamespaces) {
+                String namespace;
+                try {
+                    namespace = removePrefix(prefixedNamespace);
+                } catch (AppSearchException e) {
+                    // This should never happen. Skip this namespace if it does.
+                    Log.e(TAG, "Prefixed namespace " + prefixedNamespace + " is malformed.");
+                    continue;
+                }
+                List<String> groupedPrefixedNamespaces =
+                        namespaceToPrefixedNamespaces.get(namespace);
+                if (groupedPrefixedNamespaces == null) {
+                    groupedPrefixedNamespaces = new ArrayList<>();
+                    namespaceToPrefixedNamespaces.put(namespace, groupedPrefixedNamespaces);
+                }
+                groupedPrefixedNamespaces.add(prefixedNamespace);
+            }
+        }
+        return namespaceToPrefixedNamespaces;
+    }
+
+    /**
+     * Returns a map for package+namespace to prefixedNamespaces. This is NOT necessarily the
+     * same as the list of namespaces. If one package has multiple databases, each with the same
+     * namespace, then those should be grouped together.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters.
+     * @param namespaceMap      The namespace map contains all prefixed existing namespaces.
+     */
+    private static Map<String, List<String>> getPackageAndNamespaceToPrefixedNamespaces(
+            @NonNull Set<String> prefixes,
+            @NonNull Map<String, Set<String>> namespaceMap) {
         Map<String, List<String>> packageAndNamespaceToNamespaces = new ArrayMap<>();
         for (String prefix : prefixes) {
             Set<String> prefixedNamespaces = namespaceMap.get(prefix);
@@ -408,14 +555,113 @@
                 namespaceList.add(prefixedNamespace);
             }
         }
+        return packageAndNamespaceToNamespaces;
+    }
+
+    /**
+     * Returns a map of schema to prefixedSchemas. This is NOT necessarily the
+     * same as the list of schemas. If a schema exists under different packages and/or
+     * different databases, they should still be grouped together.
+     *
+     * @param prefixes      Prefixes that we should prepend to all our filters.
+     * @param schemaMap     The schema map contains all prefixed existing schema types.
+     */
+    private static Map<String, List<String>> getSchemaToPrefixedSchemas(
+            @NonNull Set<String> prefixes,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap) {
+        Map<String, List<String>> schemaToPrefixedSchemas = new ArrayMap<>();
+        for (String prefix : prefixes) {
+            Map<String, SchemaTypeConfigProto> prefixedSchemas = schemaMap.get(prefix);
+            if (prefixedSchemas == null) {
+                continue;
+            }
+            for (String prefixedSchema : prefixedSchemas.keySet()) {
+                String schema;
+                try {
+                    schema = removePrefix(prefixedSchema);
+                } catch (AppSearchException e) {
+                    // This should never happen. Skip this schema if it does.
+                    Log.e(TAG, "Prefixed schema " + prefixedSchema + " is malformed.");
+                    continue;
+                }
+                List<String> groupedPrefixedSchemas =
+                        schemaToPrefixedSchemas.get(schema);
+                if (groupedPrefixedSchemas == null) {
+                    groupedPrefixedSchemas = new ArrayList<>();
+                    schemaToPrefixedSchemas.put(schema, groupedPrefixedSchemas);
+                }
+                groupedPrefixedSchemas.add(prefixedSchema);
+            }
+        }
+        return schemaToPrefixedSchemas;
+    }
+
+    /**
+     * Returns a map for package+schema to prefixedSchemas. This is NOT necessarily the
+     * same as the list of schemas. If one package has multiple databases, each with the same
+     * schema, then those should be grouped together.
+     *
+     * @param prefixes      Prefixes that we should prepend to all our filters.
+     * @param schemaMap     The schema map contains all prefixed existing schema types.
+     */
+    private static Map<String, List<String>> getPackageAndSchemaToPrefixedSchemas(
+            @NonNull Set<String> prefixes,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap) {
+        Map<String, List<String>> packageAndSchemaToSchemas = new ArrayMap<>();
+        for (String prefix : prefixes) {
+            Map<String, SchemaTypeConfigProto> prefixedSchemas = schemaMap.get(prefix);
+            if (prefixedSchemas == null) {
+                continue;
+            }
+            String packageName = getPackageName(prefix);
+            // Create a new prefix without the database name. This will allow us to group schemas
+            // that have the same name and package but a different database name together.
+            String emptyDatabasePrefix = createPrefix(packageName, /*database*/"");
+            for (String prefixedSchema : prefixedSchemas.keySet()) {
+                String schema;
+                try {
+                    schema = removePrefix(prefixedSchema);
+                } catch (AppSearchException e) {
+                    // This should never happen. Skip this schema if it does.
+                    Log.e(TAG, "Prefixed schema " + prefixedSchema + " is malformed.");
+                    continue;
+                }
+                String emptyDatabasePrefixedSchema = emptyDatabasePrefix + schema;
+                List<String> schemaList =
+                        packageAndSchemaToSchemas.get(emptyDatabasePrefixedSchema);
+                if (schemaList == null) {
+                    schemaList = new ArrayList<>();
+                    packageAndSchemaToSchemas.put(emptyDatabasePrefixedSchema, schemaList);
+                }
+                schemaList.add(prefixedSchema);
+            }
+        }
+        return packageAndSchemaToSchemas;
+    }
+
+    /**
+     * Adds result groupings for each namespace in each package being queried for.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters
+     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param namespaceMap      The namespace map contains all prefixed existing namespaces.
+     * @param resultSpecBuilder ResultSpecs as specified by client
+     */
+    private static void addPerPackagePerNamespaceResultGroupings(
+            @NonNull Set<String> prefixes,
+            int maxNumResults,
+            @NonNull Map<String, Set<String>> namespaceMap,
+            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
+        Map<String, List<String>> packageAndNamespaceToNamespaces =
+                getPackageAndNamespaceToPrefixedNamespaces(prefixes, namespaceMap);
 
         for (List<String> prefixedNamespaces : packageAndNamespaceToNamespaces.values()) {
             List<ResultSpecProto.ResultGrouping.Entry> entries =
                     new ArrayList<>(prefixedNamespaces.size());
-            for (String namespace : prefixedNamespaces) {
+            for (int i = 0; i < prefixedNamespaces.size(); i++) {
                 entries.add(
                         ResultSpecProto.ResultGrouping.Entry.newBuilder()
-                                .setNamespace(namespace).build());
+                            .setNamespace(prefixedNamespaces.get(i)).build());
             }
             resultSpecBuilder.addResultGroupings(
                     ResultSpecProto.ResultGrouping.newBuilder()
@@ -424,6 +670,84 @@
     }
 
     /**
+     * Adds result groupings for each schema type in each package being queried for.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters.
+     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param schemaMap         The schema map contains all prefixed existing schema types.
+     * @param resultSpecBuilder ResultSpecs as a specified by client.
+     */
+    private static void addPerPackagePerSchemaResultGroupings(
+            @NonNull Set<String> prefixes,
+            int maxNumResults,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap,
+            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
+        Map<String, List<String>> packageAndSchemaToSchemas =
+                getPackageAndSchemaToPrefixedSchemas(prefixes, schemaMap);
+
+        for (List<String> prefixedSchemas : packageAndSchemaToSchemas.values()) {
+            List<ResultSpecProto.ResultGrouping.Entry> entries =
+                    new ArrayList<>(prefixedSchemas.size());
+            for (int i = 0; i < prefixedSchemas.size(); i++) {
+                entries.add(
+                        ResultSpecProto.ResultGrouping.Entry.newBuilder()
+                            .setSchema(prefixedSchemas.get(i)).build());
+            }
+            resultSpecBuilder.addResultGroupings(
+                    ResultSpecProto.ResultGrouping.newBuilder()
+                            .addAllEntryGroupings(entries).setMaxResults(maxNumResults));
+        }
+    }
+
+    /**
+     * Adds result groupings for each namespace and schema type being queried for.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters.
+     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param namespaceMap      The namespace map contains all prefixed existing namespaces.
+     * @param schemaMap         The schema map contains all prefixed existing schema types.
+     * @param resultSpecBuilder ResultSpec as specified by client.
+     */
+    private static void addPerPackagePerNamespacePerSchemaResultGrouping(
+            @NonNull Set<String> prefixes,
+            int maxNumResults,
+            @NonNull Map<String, Set<String>> namespaceMap,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap,
+            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
+        Map<String, List<String>> packageAndNamespaceToNamespaces =
+                getPackageAndNamespaceToPrefixedNamespaces(prefixes, namespaceMap);
+        Map<String, List<String>> packageAndSchemaToSchemas =
+                getPackageAndSchemaToPrefixedSchemas(prefixes, schemaMap);
+
+        for (List<String> prefixedNamespaces : packageAndNamespaceToNamespaces.values()) {
+            for (List<String> prefixedSchemas : packageAndSchemaToSchemas.values()) {
+                List<ResultSpecProto.ResultGrouping.Entry> entries =
+                        new ArrayList<>(prefixedNamespaces.size() * prefixedSchemas.size());
+                // Iterate through all namespaces.
+                for (int i = 0; i < prefixedNamespaces.size(); i++) {
+                    String namespacePackage = getPackageName(prefixedNamespaces.get(i));
+                    // Iterate through all schemas.
+                    for (int j = 0; j < prefixedSchemas.size(); j++) {
+                        String schemaPackage = getPackageName(prefixedSchemas.get(j));
+                        if (namespacePackage.equals(schemaPackage)) {
+                            entries.add(
+                                    ResultSpecProto.ResultGrouping.Entry.newBuilder()
+                                        .setNamespace(prefixedNamespaces.get(i))
+                                        .setSchema(prefixedSchemas.get(j))
+                                        .build());
+                        }
+                    }
+                }
+                if (entries.size() > 0) {
+                    resultSpecBuilder.addResultGroupings(
+                            ResultSpecProto.ResultGrouping.newBuilder()
+                                .addAllEntryGroupings(entries).setMaxResults(maxNumResults));
+                }
+            }
+        }
+    }
+
+    /**
      * Adds result groupings for each package being queried for.
      *
      * @param prefixes          Prefixes that we should prepend to all our filters
@@ -479,42 +803,16 @@
             int maxNumResults,
             @NonNull Map<String, Set<String>> namespaceMap,
             @NonNull ResultSpecProto.Builder resultSpecBuilder) {
-        // Create a map of namespace to prefixedNamespaces. This is NOT necessarily the
-        // same as the list of namespaces. If a namespace exists under different packages and/or
-        // different databases, they should still be grouped together.
-        Map<String, List<String>> namespaceToPrefixedNamespaces = new ArrayMap<>();
-        for (String prefix : prefixes) {
-            Set<String> prefixedNamespaces = namespaceMap.get(prefix);
-            if (prefixedNamespaces == null) {
-                continue;
-            }
-            for (String prefixedNamespace : prefixedNamespaces) {
-                String namespace;
-                try {
-                    namespace = removePrefix(prefixedNamespace);
-                } catch (AppSearchException e) {
-                    // This should never happen. Skip this namespace if it does.
-                    Log.e(TAG, "Prefixed namespace " + prefixedNamespace + " is malformed.");
-                    continue;
-                }
-                List<String> groupedPrefixedNamespaces =
-                        namespaceToPrefixedNamespaces.get(namespace);
-                if (groupedPrefixedNamespaces == null) {
-                    groupedPrefixedNamespaces = new ArrayList<>();
-                    namespaceToPrefixedNamespaces.put(namespace,
-                            groupedPrefixedNamespaces);
-                }
-                groupedPrefixedNamespaces.add(prefixedNamespace);
-            }
-        }
+        Map<String, List<String>> namespaceToPrefixedNamespaces =
+                getNamespaceToPrefixedNamespaces(prefixes, namespaceMap);
 
         for (List<String> prefixedNamespaces : namespaceToPrefixedNamespaces.values()) {
             List<ResultSpecProto.ResultGrouping.Entry> entries =
                     new ArrayList<>(prefixedNamespaces.size());
-            for (String namespace : prefixedNamespaces) {
+            for (int i = 0; i < prefixedNamespaces.size(); i++) {
                 entries.add(
                         ResultSpecProto.ResultGrouping.Entry.newBuilder()
-                                .setNamespace(namespace).build());
+                            .setNamespace(prefixedNamespaces.get(i)).build());
             }
             resultSpecBuilder.addResultGroupings(
                     ResultSpecProto.ResultGrouping.newBuilder()
@@ -523,6 +821,90 @@
     }
 
     /**
+     * Adds result groupings for each schema type being queried for.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters.
+     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param schemaMap         The schema map contains all prefixed existing schema types.
+     * @param resultSpecBuilder ResultSpec as specified by client.
+     */
+    private static void addPerSchemaResultGrouping(
+            @NonNull Set<String> prefixes,
+            int maxNumResults,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap,
+            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
+        Map<String, List<String>> schemaToPrefixedSchemas =
+                getSchemaToPrefixedSchemas(prefixes, schemaMap);
+
+        for (List<String> prefixedSchemas : schemaToPrefixedSchemas.values()) {
+            List<ResultSpecProto.ResultGrouping.Entry> entries =
+                    new ArrayList<>(prefixedSchemas.size());
+            for (int i = 0; i < prefixedSchemas.size(); i++) {
+                entries.add(
+                        ResultSpecProto.ResultGrouping.Entry.newBuilder()
+                            .setSchema(prefixedSchemas.get(i)).build());
+            }
+            resultSpecBuilder.addResultGroupings(
+                    ResultSpecProto.ResultGrouping.newBuilder()
+                            .addAllEntryGroupings(entries).setMaxResults(maxNumResults));
+        }
+    }
+
+    /**
+     * Adds result groupings for each namespace and schema type being queried for.
+     *
+     * @param prefixes          Prefixes that we should prepend to all our filters.
+     * @param maxNumResults     The maximum number of results for each grouping to support.
+     * @param namespaceMap      The namespace map contains all prefixed existing namespaces.
+     * @param schemaMap         The schema map contains all prefixed existing schema types.
+     * @param resultSpecBuilder ResultSpec as specified by client.
+     */
+    private static void addPerNamespaceAndSchemaResultGrouping(
+            @NonNull Set<String> prefixes,
+            int maxNumResults,
+            @NonNull Map<String, Set<String>> namespaceMap,
+            @NonNull Map<String, Map<String, SchemaTypeConfigProto>> schemaMap,
+            @NonNull ResultSpecProto.Builder resultSpecBuilder) {
+        Map<String, List<String>> namespaceToPrefixedNamespaces =
+                getNamespaceToPrefixedNamespaces(prefixes, namespaceMap);
+        Map<String, List<String>> schemaToPrefixedSchemas =
+                getSchemaToPrefixedSchemas(prefixes, schemaMap);
+
+        for (List<String> prefixedNamespaces : namespaceToPrefixedNamespaces.values()) {
+            for (List<String> prefixedSchemas : schemaToPrefixedSchemas.values()) {
+                List<ResultSpecProto.ResultGrouping.Entry> entries =
+                        new ArrayList<>(prefixedNamespaces.size() * prefixedSchemas.size());
+                // Iterate through all namespaces.
+                for (int i = 0; i < prefixedNamespaces.size(); i++) {
+                    // Iterate through all schemas.
+                    for (int j = 0; j < prefixedSchemas.size(); j++) {
+                        try {
+                            if (getPrefix(prefixedNamespaces.get(i))
+                                    .equals(getPrefix(prefixedSchemas.get(j)))) {
+                                entries.add(
+                                                ResultSpecProto.ResultGrouping.Entry.newBuilder()
+                                                .setNamespace(prefixedNamespaces.get(i))
+                                                .setSchema(prefixedSchemas.get(j))
+                                                .build());
+                            }
+                        } catch (AppSearchException e) {
+                            // This should never happen. Skip this schema if it does.
+                            Log.e(TAG, "Prefixed string " + prefixedNamespaces.get(i) + " or "
+                                    + prefixedSchemas.get(j) + " is malformed.");
+                            continue;
+                        }
+                    }
+                }
+                if (entries.size() > 0) {
+                    resultSpecBuilder.addResultGroupings(
+                            ResultSpecProto.ResultGrouping.newBuilder()
+                                .addAllEntryGroupings(entries).setMaxResults(maxNumResults));
+                }
+            }
+        }
+    }
+
+    /**
      * Adds {@link TypePropertyWeights} to {@link ScoringSpecProto}.
      *
      * <p>{@link TypePropertyWeights} are added to the {@link ScoringSpecProto} with database and

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/CallStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/CallStats.java
index cb29317..02d2971 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/CallStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/CallStats.java

@@ -20,11 +20,16 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
+import androidx.collection.ArraySet;
 import androidx.core.util.Preconditions;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
+import java.util.Set;
 
 /**
  * A class for setting basic information to log for all function calls.
@@ -36,7 +41,7 @@
  * However, {@link CallStats} can still be used along with the detailed stats class for easy
  * aggregation/analysis with other function calls.
  *
- * @hide
+ * <!--@exportToFramework:hide-->
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class CallStats {
@@ -58,6 +63,20 @@
             CALL_TYPE_REMOVE_DOCUMENT_BY_SEARCH,
             CALL_TYPE_GLOBAL_GET_DOCUMENT_BY_ID,
             CALL_TYPE_SCHEMA_MIGRATION,
+            CALL_TYPE_GLOBAL_GET_SCHEMA,
+            CALL_TYPE_GET_SCHEMA,
+            CALL_TYPE_GET_NAMESPACES,
+            CALL_TYPE_GET_NEXT_PAGE,
+            CALL_TYPE_INVALIDATE_NEXT_PAGE_TOKEN,
+            CALL_TYPE_WRITE_SEARCH_RESULTS_TO_FILE,
+            CALL_TYPE_PUT_DOCUMENTS_FROM_FILE,
+            CALL_TYPE_SEARCH_SUGGESTION,
+            CALL_TYPE_REPORT_SYSTEM_USAGE,
+            CALL_TYPE_REPORT_USAGE,
+            CALL_TYPE_GET_STORAGE_INFO,
+            CALL_TYPE_REGISTER_OBSERVER_CALLBACK,
+            CALL_TYPE_UNREGISTER_OBSERVER_CALLBACK,
+            CALL_TYPE_GLOBAL_GET_NEXT_PAGE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface CallType {
@@ -80,6 +99,51 @@
     public static final int CALL_TYPE_REMOVE_DOCUMENT_BY_SEARCH = 14;
     public static final int CALL_TYPE_GLOBAL_GET_DOCUMENT_BY_ID = 15;
     public static final int CALL_TYPE_SCHEMA_MIGRATION = 16;
+    public static final int CALL_TYPE_GLOBAL_GET_SCHEMA = 17;
+    public static final int CALL_TYPE_GET_SCHEMA = 18;
+    public static final int CALL_TYPE_GET_NAMESPACES = 19;
+    public static final int CALL_TYPE_GET_NEXT_PAGE = 20;
+    public static final int CALL_TYPE_INVALIDATE_NEXT_PAGE_TOKEN = 21;
+    public static final int CALL_TYPE_WRITE_SEARCH_RESULTS_TO_FILE = 22;
+    public static final int CALL_TYPE_PUT_DOCUMENTS_FROM_FILE = 23;
+    public static final int CALL_TYPE_SEARCH_SUGGESTION = 24;
+    public static final int CALL_TYPE_REPORT_SYSTEM_USAGE = 25;
+    public static final int CALL_TYPE_REPORT_USAGE = 26;
+    public static final int CALL_TYPE_GET_STORAGE_INFO = 27;
+    public static final int CALL_TYPE_REGISTER_OBSERVER_CALLBACK = 28;
+    public static final int CALL_TYPE_UNREGISTER_OBSERVER_CALLBACK = 29;
+    public static final int CALL_TYPE_GLOBAL_GET_NEXT_PAGE = 30;
+
+    // These strings are for the subset of call types that correspond to an AppSearchManager API
+    private static final String CALL_TYPE_STRING_INITIALIZE = "initialize";
+    private static final String CALL_TYPE_STRING_SET_SCHEMA = "localSetSchema";
+    private static final String CALL_TYPE_STRING_PUT_DOCUMENTS = "localPutDocuments";
+    private static final String CALL_TYPE_STRING_GET_DOCUMENTS = "localGetDocuments";
+    private static final String CALL_TYPE_STRING_REMOVE_DOCUMENTS_BY_ID = "localRemoveByDocumentId";
+    private static final String CALL_TYPE_STRING_SEARCH = "localSearch";
+    private static final String CALL_TYPE_STRING_FLUSH = "flush";
+    private static final String CALL_TYPE_STRING_GLOBAL_SEARCH = "globalSearch";
+    private static final String CALL_TYPE_STRING_REMOVE_DOCUMENTS_BY_SEARCH = "localRemoveBySearch";
+    private static final String CALL_TYPE_STRING_GLOBAL_GET_DOCUMENT_BY_ID = "globalGetDocuments";
+    private static final String CALL_TYPE_STRING_GLOBAL_GET_SCHEMA = "globalGetSchema";
+    private static final String CALL_TYPE_STRING_GET_SCHEMA = "localGetSchema";
+    private static final String CALL_TYPE_STRING_GET_NAMESPACES = "localGetNamespaces";
+    private static final String CALL_TYPE_STRING_GET_NEXT_PAGE = "localGetNextPage";
+    private static final String CALL_TYPE_STRING_INVALIDATE_NEXT_PAGE_TOKEN =
+            "invalidateNextPageToken";
+    private static final String CALL_TYPE_STRING_WRITE_SEARCH_RESULTS_TO_FILE =
+            "localWriteSearchResultsToFile";
+    private static final String CALL_TYPE_STRING_PUT_DOCUMENTS_FROM_FILE =
+            "localPutDocumentsFromFile";
+    private static final String CALL_TYPE_STRING_SEARCH_SUGGESTION = "localSearchSuggestion";
+    private static final String CALL_TYPE_STRING_REPORT_SYSTEM_USAGE = "globalReportUsage";
+    private static final String CALL_TYPE_STRING_REPORT_USAGE = "localReportUsage";
+    private static final String CALL_TYPE_STRING_GET_STORAGE_INFO = "localGetStorageInfo";
+    private static final String CALL_TYPE_STRING_REGISTER_OBSERVER_CALLBACK =
+            "globalRegisterObserverCallback";
+    private static final String CALL_TYPE_STRING_UNREGISTER_OBSERVER_CALLBACK =
+            "globalUnregisterObserverCallback";
+    private static final String CALL_TYPE_STRING_GLOBAL_GET_NEXT_PAGE = "globalGetNextPage";
 
     @Nullable
     private final String mPackageName;
@@ -149,8 +213,9 @@
      * Returns number of operations succeeded.
      *
      * <p>For example, for
-     * {@link androidx.appsearch.app.AppSearchSession#putAsync}, it is the total number of individual
-     * successful put operations. In this case, how many documents are successfully indexed.
+     * {@link androidx.appsearch.app.AppSearchSession#putAsync}, it is the total number of
+     * individual successful put operations. In this case, how many documents are successfully
+     * indexed.
      *
      * <p>For non-batch calls such as
      * {@link androidx.appsearch.app.AppSearchSession#setSchemaAsync}, the sum of
@@ -166,8 +231,8 @@
      * Returns number of operations failed.
      *
      * <p>For example, for
-     * {@link androidx.appsearch.app.AppSearchSession#putAsync}, it is the total number of individual
-     * failed put operations. In this case, how many documents are failed to be indexed.
+     * {@link androidx.appsearch.app.AppSearchSession#putAsync}, it is the total number of
+     * individual failed put operations. In this case, how many documents are failed to be indexed.
      *
      * <p>For non-batch calls such as
      * {@link androidx.appsearch.app.AppSearchSession#setSchemaAsync}, the sum of
@@ -195,20 +260,23 @@
         int mNumOperationsFailed;
 
         /** Sets the PackageName used by the session. */
+        @CanIgnoreReturnValue
         @NonNull
-        public Builder setPackageName(@NonNull String packageName) {
-            mPackageName = Preconditions.checkNotNull(packageName);
+        public Builder setPackageName(@Nullable String packageName) {
+            mPackageName = packageName;
             return this;
         }
 
         /** Sets the database used by the session. */
+        @CanIgnoreReturnValue
         @NonNull
-        public Builder setDatabase(@NonNull String database) {
-            mDatabase = Preconditions.checkNotNull(database);
+        public Builder setDatabase(@Nullable String database) {
+            mDatabase = database;
             return this;
         }
 
         /** Sets the status code. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -216,6 +284,7 @@
         }
 
         /** Sets total latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -223,6 +292,7 @@
         }
 
         /** Sets type of the call. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setCallType(@CallType int callType) {
             mCallType = callType;
@@ -230,6 +300,7 @@
         }
 
         /** Sets estimated binder latency, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setEstimatedBinderLatencyMillis(int estimatedBinderLatencyMillis) {
             mEstimatedBinderLatencyMillis = estimatedBinderLatencyMillis;
@@ -250,6 +321,7 @@
          * {@link CallStats#getNumOperationsFailed()} is always 1 since there is only one
          * operation.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNumOperationsSucceeded(int numOperationsSucceeded) {
             mNumOperationsSucceeded = numOperationsSucceeded;
@@ -269,6 +341,7 @@
          * {@link CallStats#getNumOperationsFailed()} is always 1 since there is only one
          * operation.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNumOperationsFailed(int numOperationsFailed) {
             mNumOperationsFailed = numOperationsFailed;
@@ -281,4 +354,97 @@
             return new CallStats(/* builder= */ this);
         }
     }
+
+    /**
+     * Returns the {@link CallStats.CallType} represented by the given AppSearchManager API name. If
+     * an unknown name is provided, {@link CallStats.CallType#CALL_TYPE_UNKNOWN} is returned.
+     */
+    @CallType
+    public static int getApiCallTypeFromName(@NonNull String name) {
+        switch (name) {
+            case CALL_TYPE_STRING_INITIALIZE:
+                return CALL_TYPE_INITIALIZE;
+            case CALL_TYPE_STRING_SET_SCHEMA:
+                return CALL_TYPE_SET_SCHEMA;
+            case CALL_TYPE_STRING_PUT_DOCUMENTS:
+                return CALL_TYPE_PUT_DOCUMENTS;
+            case CALL_TYPE_STRING_GET_DOCUMENTS:
+                return CALL_TYPE_GET_DOCUMENTS;
+            case CALL_TYPE_STRING_REMOVE_DOCUMENTS_BY_ID:
+                return CALL_TYPE_REMOVE_DOCUMENTS_BY_ID;
+            case CALL_TYPE_STRING_SEARCH:
+                return CALL_TYPE_SEARCH;
+            case CALL_TYPE_STRING_FLUSH:
+                return CALL_TYPE_FLUSH;
+            case CALL_TYPE_STRING_GLOBAL_SEARCH:
+                return CALL_TYPE_GLOBAL_SEARCH;
+            case CALL_TYPE_STRING_REMOVE_DOCUMENTS_BY_SEARCH:
+                return CALL_TYPE_REMOVE_DOCUMENTS_BY_SEARCH;
+            case CALL_TYPE_STRING_GLOBAL_GET_DOCUMENT_BY_ID:
+                return CALL_TYPE_GLOBAL_GET_DOCUMENT_BY_ID;
+            case CALL_TYPE_STRING_GLOBAL_GET_SCHEMA:
+                return CALL_TYPE_GLOBAL_GET_SCHEMA;
+            case CALL_TYPE_STRING_GET_SCHEMA:
+                return CALL_TYPE_GET_SCHEMA;
+            case CALL_TYPE_STRING_GET_NAMESPACES:
+                return CALL_TYPE_GET_NAMESPACES;
+            case CALL_TYPE_STRING_GET_NEXT_PAGE:
+                return CALL_TYPE_GET_NEXT_PAGE;
+            case CALL_TYPE_STRING_INVALIDATE_NEXT_PAGE_TOKEN:
+                return CALL_TYPE_INVALIDATE_NEXT_PAGE_TOKEN;
+            case CALL_TYPE_STRING_WRITE_SEARCH_RESULTS_TO_FILE:
+                return CALL_TYPE_WRITE_SEARCH_RESULTS_TO_FILE;
+            case CALL_TYPE_STRING_PUT_DOCUMENTS_FROM_FILE:
+                return CALL_TYPE_PUT_DOCUMENTS_FROM_FILE;
+            case CALL_TYPE_STRING_SEARCH_SUGGESTION:
+                return CALL_TYPE_SEARCH_SUGGESTION;
+            case CALL_TYPE_STRING_REPORT_SYSTEM_USAGE:
+                return CALL_TYPE_REPORT_SYSTEM_USAGE;
+            case CALL_TYPE_STRING_REPORT_USAGE:
+                return CALL_TYPE_REPORT_USAGE;
+            case CALL_TYPE_STRING_GET_STORAGE_INFO:
+                return CALL_TYPE_GET_STORAGE_INFO;
+            case CALL_TYPE_STRING_REGISTER_OBSERVER_CALLBACK:
+                return CALL_TYPE_REGISTER_OBSERVER_CALLBACK;
+            case CALL_TYPE_STRING_UNREGISTER_OBSERVER_CALLBACK:
+                return CALL_TYPE_UNREGISTER_OBSERVER_CALLBACK;
+            case CALL_TYPE_STRING_GLOBAL_GET_NEXT_PAGE:
+                return CALL_TYPE_GLOBAL_GET_NEXT_PAGE;
+            default:
+                return CALL_TYPE_UNKNOWN;
+        }
+    }
+
+    /**
+     * Returns the set of all {@link CallStats.CallType} that map to an AppSearchManager API.
+     */
+    @VisibleForTesting
+    @NonNull
+    public static Set<Integer> getAllApiCallTypes() {
+        return new ArraySet<>(Arrays.asList(
+                CALL_TYPE_INITIALIZE,
+                CALL_TYPE_SET_SCHEMA,
+                CALL_TYPE_PUT_DOCUMENTS,
+                CALL_TYPE_GET_DOCUMENTS,
+                CALL_TYPE_REMOVE_DOCUMENTS_BY_ID,
+                CALL_TYPE_SEARCH,
+                CALL_TYPE_FLUSH,
+                CALL_TYPE_GLOBAL_SEARCH,
+                CALL_TYPE_REMOVE_DOCUMENTS_BY_SEARCH,
+                CALL_TYPE_GLOBAL_GET_DOCUMENT_BY_ID,
+                CALL_TYPE_GLOBAL_GET_SCHEMA,
+                CALL_TYPE_GET_SCHEMA,
+                CALL_TYPE_GET_NAMESPACES,
+                CALL_TYPE_GET_NEXT_PAGE,
+                CALL_TYPE_INVALIDATE_NEXT_PAGE_TOKEN,
+                CALL_TYPE_WRITE_SEARCH_RESULTS_TO_FILE,
+                CALL_TYPE_PUT_DOCUMENTS_FROM_FILE,
+                CALL_TYPE_SEARCH_SUGGESTION,
+                CALL_TYPE_REPORT_SYSTEM_USAGE,
+                CALL_TYPE_REPORT_USAGE,
+                CALL_TYPE_GET_STORAGE_INFO,
+                CALL_TYPE_REGISTER_OBSERVER_CALLBACK,
+                CALL_TYPE_UNREGISTER_OBSERVER_CALLBACK,
+                CALL_TYPE_GLOBAL_GET_NEXT_PAGE));
+    }
 }

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/InitializeStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/InitializeStats.java
index f88d257..6effe35 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/InitializeStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/InitializeStats.java

@@ -19,6 +19,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
 import androidx.core.util.Preconditions;
 
@@ -288,6 +289,7 @@
         int mResetStatusCode;
 
         /** Sets the status of the initialization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -295,6 +297,7 @@
         }
 
         /** Sets the total latency of the initialization in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -307,6 +310,7 @@
          * <p>If there is a deSync, it means AppSearch and IcingSearchEngine have an inconsistent
          * view of what data should exist.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setHasDeSync(boolean hasDeSync) {
             mHasDeSync = hasDeSync;
@@ -314,6 +318,7 @@
         }
 
         /** Sets time used to read and process the schema and namespaces. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setPrepareSchemaAndNamespacesLatencyMillis(
                 int prepareSchemaAndNamespacesLatencyMillis) {
@@ -322,6 +327,7 @@
         }
 
         /** Sets time used to read and process the visibility file. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setPrepareVisibilityStoreLatencyMillis(
                 int prepareVisibilityStoreLatencyMillis) {
@@ -330,6 +336,7 @@
         }
 
         /** Sets overall time used for the native function call. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLatencyMillis(int nativeLatencyMillis) {
             mNativeLatencyMillis = nativeLatencyMillis;
@@ -344,6 +351,7 @@
          * <li> {@link InitializeStats#RECOVERY_CAUSE_TOTAL_CHECKSUM_MISMATCH}
          * <li> {@link InitializeStats#RECOVERY_CAUSE_IO_ERROR}
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentStoreRecoveryCause(
                 @RecoveryCause int documentStoreRecoveryCause) {
@@ -358,6 +366,7 @@
          *      <li> {@link InitializeStats#RECOVERY_CAUSE_TOTAL_CHECKSUM_MISMATCH}
          *      <li> {@link InitializeStats#RECOVERY_CAUSE_IO_ERROR}
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIndexRestorationCause(
                 @RecoveryCause int indexRestorationCause) {
@@ -370,6 +379,7 @@
          *  <p> Possible causes:
          *      <li> {@link InitializeStats#RECOVERY_CAUSE_IO_ERROR}
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setSchemaStoreRecoveryCause(
                 @RecoveryCause int schemaStoreRecoveryCause) {
@@ -378,6 +388,7 @@
         }
 
         /** Sets time used to recover the document store. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentStoreRecoveryLatencyMillis(
                 int documentStoreRecoveryLatencyMillis) {
@@ -386,6 +397,7 @@
         }
 
         /** Sets time used to restore the index. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIndexRestorationLatencyMillis(
                 int indexRestorationLatencyMillis) {
@@ -394,6 +406,7 @@
         }
 
         /** Sets time used to recover the schema store. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setSchemaStoreRecoveryLatencyMillis(
                 int schemaStoreRecoveryLatencyMillis) {
@@ -405,6 +418,7 @@
          * Sets Native Document Store Data status.
          * status is defined in external/icing/proto/icing/proto/logging.proto
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentStoreDataStatus(
                 @DocumentStoreDataStatus int documentStoreDataStatus) {
@@ -416,6 +430,7 @@
          * Sets number of documents currently in document store. Those may include alive, deleted,
          * and expired documents.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentCount(int numDocuments) {
             mNativeNumDocuments = numDocuments;
@@ -423,6 +438,7 @@
         }
 
         /** Sets number of schema types currently in the schema store. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setSchemaTypeCount(int numSchemaTypes) {
             mNativeNumSchemaTypes = numSchemaTypes;
@@ -430,6 +446,7 @@
         }
 
         /** Sets whether we had to reset the index, losing all data, as part of initialization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setHasReset(boolean hasReset) {
             mHasReset = hasReset;
@@ -437,6 +454,7 @@
         }
 
         /** Sets the status of the reset, if one was performed according to {@link #setHasReset}. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setResetStatusCode(@AppSearchResult.ResultCode int resetStatusCode) {
             mResetStatusCode = resetStatusCode;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/OptimizeStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/OptimizeStats.java
index b7dcae0..2a47183 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/OptimizeStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/OptimizeStats.java

@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
 import androidx.core.util.Preconditions;
 
@@ -156,6 +157,7 @@
         long mNativeTimeSinceLastOptimizeMillis;
 
         /** Sets the status code. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -163,6 +165,7 @@
         }
 
         /** Sets total latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -170,6 +173,7 @@
         }
 
         /** Sets native latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLatencyMillis(int nativeLatencyMillis) {
             mNativeLatencyMillis = nativeLatencyMillis;
@@ -177,6 +181,7 @@
         }
 
         /** Sets time used to optimize the document store. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentStoreOptimizeLatencyMillis(
                 int documentStoreOptimizeLatencyMillis) {
@@ -185,6 +190,7 @@
         }
 
         /** Sets time used to restore the index. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIndexRestorationLatencyMillis(int indexRestorationLatencyMillis) {
             mNativeIndexRestorationLatencyMillis = indexRestorationLatencyMillis;
@@ -192,6 +198,7 @@
         }
 
         /** Sets number of documents before the optimization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setOriginalDocumentCount(int originalDocumentCount) {
             mNativeOriginalDocumentCount = originalDocumentCount;
@@ -199,6 +206,7 @@
         }
 
         /** Sets number of documents deleted during the optimization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDeletedDocumentCount(int deletedDocumentCount) {
             mNativeDeletedDocumentCount = deletedDocumentCount;
@@ -206,6 +214,7 @@
         }
 
         /** Sets number of documents expired during the optimization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setExpiredDocumentCount(int expiredDocumentCount) {
             mNativeExpiredDocumentCount = expiredDocumentCount;
@@ -213,6 +222,7 @@
         }
 
         /** Sets Storage size in bytes before optimization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStorageSizeBeforeBytes(long storageSizeBeforeBytes) {
             mNativeStorageSizeBeforeBytes = storageSizeBeforeBytes;
@@ -220,6 +230,7 @@
         }
 
         /** Sets storage size in bytes after optimization. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStorageSizeAfterBytes(long storageSizeAfterBytes) {
             mNativeStorageSizeAfterBytes = storageSizeAfterBytes;
@@ -229,6 +240,7 @@
         /**
          * Sets the amount the time since the last optimize ran calculated using wall clock time.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTimeSinceLastOptimizeMillis(long timeSinceLastOptimizeMillis) {
             mNativeTimeSinceLastOptimizeMillis = timeSinceLastOptimizeMillis;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/PutDocumentStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/PutDocumentStats.java
index e9a25fd..3378df7 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/PutDocumentStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/PutDocumentStats.java

@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
 import androidx.core.util.Preconditions;
 
@@ -169,6 +170,7 @@
         }
 
         /** Sets the status code. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -176,6 +178,7 @@
         }
 
         /** Sets total latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -183,6 +186,7 @@
         }
 
         /** Sets how much time we spend for generating document proto, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setGenerateDocumentProtoLatencyMillis(
                 int generateDocumentProtoLatencyMillis) {
@@ -194,6 +198,7 @@
          * Sets how much time we spend for rewriting types and namespaces in document, in
          * milliseconds.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRewriteDocumentTypesLatencyMillis(int rewriteDocumentTypesLatencyMillis) {
             mRewriteDocumentTypesLatencyMillis = rewriteDocumentTypesLatencyMillis;
@@ -201,6 +206,7 @@
         }
 
         /** Sets the native latency, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLatencyMillis(int nativeLatencyMillis) {
             mNativeLatencyMillis = nativeLatencyMillis;
@@ -208,6 +214,7 @@
         }
 
         /** Sets how much time we spend on document store, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeDocumentStoreLatencyMillis(int nativeDocumentStoreLatencyMillis) {
             mNativeDocumentStoreLatencyMillis = nativeDocumentStoreLatencyMillis;
@@ -215,6 +222,7 @@
         }
 
         /** Sets the native index latency, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeIndexLatencyMillis(int nativeIndexLatencyMillis) {
             mNativeIndexLatencyMillis = nativeIndexLatencyMillis;
@@ -222,6 +230,7 @@
         }
 
         /** Sets how much time we spend on merging indices, in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeIndexMergeLatencyMillis(int nativeIndexMergeLatencyMillis) {
             mNativeIndexMergeLatencyMillis = nativeIndexMergeLatencyMillis;
@@ -229,6 +238,7 @@
         }
 
         /** Sets document size, in bytes. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeDocumentSizeBytes(int nativeDocumentSizeBytes) {
             mNativeDocumentSizeBytes = nativeDocumentSizeBytes;
@@ -236,6 +246,7 @@
         }
 
         /** Sets number of tokens indexed in native. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeNumTokensIndexed(int nativeNumTokensIndexed) {
             mNativeNumTokensIndexed = nativeNumTokensIndexed;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/RemoveStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/RemoveStats.java
index 7eb4820..ffb3f3a 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/RemoveStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/RemoveStats.java

@@ -19,6 +19,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
 import androidx.appsearch.app.RemoveByDocumentIdRequest;
 import androidx.appsearch.app.SearchSpec;
@@ -148,6 +149,7 @@
         }
 
         /** Sets the status code. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -155,6 +157,7 @@
         }
 
         /** Sets total latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -162,6 +165,7 @@
         }
 
         /** Sets native latency in millis. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLatencyMillis(int nativeLatencyMillis) {
             mNativeLatencyMillis = nativeLatencyMillis;
@@ -169,6 +173,7 @@
         }
 
         /** Sets delete type for this call. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDeleteType(@DeleteType int nativeDeleteType) {
             mNativeDeleteType = nativeDeleteType;
@@ -176,6 +181,7 @@
         }
 
         /** Sets how many documents get deleted for this call. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDeletedDocumentCount(int nativeNumDocumentsDeleted) {
             mNativeNumDocumentsDeleted = nativeNumDocumentsDeleted;

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SearchStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SearchStats.java
index bc46326..6945221 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SearchStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SearchStats.java

@@ -19,7 +19,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.JoinableValueType;
 import androidx.appsearch.app.SearchSpec;
 import androidx.core.util.Preconditions;
 
@@ -129,7 +131,12 @@
     private final int mJavaToNativeJniLatencyMillis;
     /** Time used to send data across the JNI boundary from native to java side. */
     private final int mNativeToJavaJniLatencyMillis;
-
+    /** The type of join performed. Zero if no join is performed */
+    @JoinableValueType private final int mJoinType;
+    /** The total number of joined documents in the current page. */
+    private final int mNativeNumJoinedResultsCurrentPage;
+    /** Time taken to join documents together. */
+    private final int mNativeJoinLatencyMillis;
 
     SearchStats(@NonNull Builder builder) {
         Preconditions.checkNotNull(builder);
@@ -160,6 +167,9 @@
         mNativeLockAcquisitionLatencyMillis = builder.mNativeLockAcquisitionLatencyMillis;
         mJavaToNativeJniLatencyMillis = builder.mJavaToNativeJniLatencyMillis;
         mNativeToJavaJniLatencyMillis = builder.mNativeToJavaJniLatencyMillis;
+        mJoinType = builder.mJoinType;
+        mNativeNumJoinedResultsCurrentPage = builder.mNativeNumJoinedResultsCurrentPage;
+        mNativeJoinLatencyMillis = builder.mNativeJoinLatencyMillis;
     }
 
     /** Returns the package name of the session. */
@@ -317,6 +327,21 @@
         return mNativeToJavaJniLatencyMillis;
     }
 
+    /** Returns the type of join performed. Blank if no join is performed */
+    public @JoinableValueType int getJoinType() {
+        return mJoinType;
+    }
+
+    /** Returns the total number of joined documents in the current page. */
+    public int getNumJoinedResultsCurrentPage() {
+        return mNativeNumJoinedResultsCurrentPage;
+    }
+
+    /** Returns the time taken to join documents together. */
+    public int getJoinLatencyMillis() {
+        return mNativeJoinLatencyMillis;
+    }
+
     /** Builder for {@link SearchStats} */
     public static class Builder {
         @NonNull
@@ -349,7 +374,9 @@
         int mNativeLockAcquisitionLatencyMillis;
         int mJavaToNativeJniLatencyMillis;
         int mNativeToJavaJniLatencyMillis;
-
+        @JoinableValueType int mJoinType;
+        int mNativeNumJoinedResultsCurrentPage;
+        int mNativeJoinLatencyMillis;
 
         /**
          * Constructor
@@ -363,13 +390,15 @@
         }
 
         /** Sets the database used by the session. */
+        @CanIgnoreReturnValue
         @NonNull
-        public Builder setDatabase(@NonNull String database) {
-            mDatabase = Preconditions.checkNotNull(database);
+        public Builder setDatabase(@Nullable String database) {
+            mDatabase = database;
             return this;
         }
 
         /** Sets the status of the search. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -377,6 +406,7 @@
         }
 
         /** Sets total latency for the search. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -384,6 +414,7 @@
         }
 
         /** Sets time used to rewrite the search spec. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRewriteSearchSpecLatencyMillis(int rewriteSearchSpecLatencyMillis) {
             mRewriteSearchSpecLatencyMillis = rewriteSearchSpecLatencyMillis;
@@ -391,6 +422,7 @@
         }
 
         /** Sets time used to rewrite the search results. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRewriteSearchResultLatencyMillis(int rewriteSearchResultLatencyMillis) {
             mRewriteSearchResultLatencyMillis = rewriteSearchResultLatencyMillis;
@@ -398,6 +430,7 @@
         }
 
         /** Sets time passed while waiting to acquire the lock during Java function calls. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setJavaLockAcquisitionLatencyMillis(int javaLockAcquisitionLatencyMillis) {
             mJavaLockAcquisitionLatencyMillis = javaLockAcquisitionLatencyMillis;
@@ -408,6 +441,7 @@
          * Sets time spent on ACL checking, which is the time spent filtering namespaces based on
          * package permissions and Android permission access.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setAclCheckLatencyMillis(int aclCheckLatencyMillis) {
             mAclCheckLatencyMillis = aclCheckLatencyMillis;
@@ -415,6 +449,7 @@
         }
 
         /** Sets overall time used for the native function calls. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLatencyMillis(int nativeLatencyMillis) {
             mNativeLatencyMillis = nativeLatencyMillis;
@@ -422,6 +457,7 @@
         }
 
         /** Sets number of terms in the search string. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTermCount(int termCount) {
             mNativeNumTerms = termCount;
@@ -429,6 +465,7 @@
         }
 
         /** Sets length of the search string. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setQueryLength(int queryLength) {
             mNativeQueryLength = queryLength;
@@ -436,6 +473,7 @@
         }
 
         /** Sets number of namespaces filtered. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setFilteredNamespaceCount(int filteredNamespaceCount) {
             mNativeNumNamespacesFiltered = filteredNamespaceCount;
@@ -443,6 +481,7 @@
         }
 
         /** Sets number of schema types filtered. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setFilteredSchemaTypeCount(int filteredSchemaTypeCount) {
             mNativeNumSchemaTypesFiltered = filteredSchemaTypeCount;
@@ -450,6 +489,7 @@
         }
 
         /** Sets the requested number of results in one page. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRequestedPageSize(int requestedPageSize) {
             mNativeRequestedPageSize = requestedPageSize;
@@ -457,6 +497,7 @@
         }
 
         /** Sets the actual number of results returned in the current page. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setCurrentPageReturnedResultCount(
                 int currentPageReturnedResultCount) {
@@ -469,6 +510,7 @@
          * not, Icing will fetch the results from cache so that some steps
          * may be skipped.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIsFirstPage(boolean nativeIsFirstPage) {
             mNativeIsFirstPage = nativeIsFirstPage;
@@ -479,6 +521,7 @@
          * Sets time used to parse the query, including 2 parts: tokenizing and
          * transforming tokens into an iterator tree.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setParseQueryLatencyMillis(int parseQueryLatencyMillis) {
             mNativeParseQueryLatencyMillis = parseQueryLatencyMillis;
@@ -486,6 +529,7 @@
         }
 
         /** Sets strategy of scoring and ranking. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRankingStrategy(
                 @SearchSpec.RankingStrategy int rankingStrategy) {
@@ -494,6 +538,7 @@
         }
 
         /** Sets number of documents scored. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setScoredDocumentCount(int scoredDocumentCount) {
             mNativeNumDocumentsScored = scoredDocumentCount;
@@ -501,6 +546,7 @@
         }
 
         /** Sets time used to score the raw results. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setScoringLatencyMillis(int scoringLatencyMillis) {
             mNativeScoringLatencyMillis = scoringLatencyMillis;
@@ -508,6 +554,7 @@
         }
 
         /** Sets time used to rank the scored results. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRankingLatencyMillis(int rankingLatencyMillis) {
             mNativeRankingLatencyMillis = rankingLatencyMillis;
@@ -515,6 +562,7 @@
         }
 
         /** Sets time used to fetch the document protos. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDocumentRetrievingLatencyMillis(
                 int documentRetrievingLatencyMillis) {
@@ -523,6 +571,7 @@
         }
 
         /** Sets how many snippets are calculated. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setResultWithSnippetsCount(int resultWithSnippetsCount) {
             mNativeNumResultsWithSnippets = resultWithSnippetsCount;
@@ -530,6 +579,7 @@
         }
 
         /** Sets time passed while waiting to acquire the lock during native function calls. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeLockAcquisitionLatencyMillis(
                 int nativeLockAcquisitionLatencyMillis) {
@@ -538,6 +588,7 @@
         }
 
         /** Sets time used to send data across the JNI boundary from java to native side. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setJavaToNativeJniLatencyMillis(int javaToNativeJniLatencyMillis) {
             mJavaToNativeJniLatencyMillis = javaToNativeJniLatencyMillis;
@@ -545,12 +596,34 @@
         }
 
         /** Sets time used to send data across the JNI boundary from native to java side. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNativeToJavaJniLatencyMillis(int nativeToJavaJniLatencyMillis) {
             mNativeToJavaJniLatencyMillis = nativeToJavaJniLatencyMillis;
             return this;
         }
 
+        /** Sets whether or not this is a join query */
+        @NonNull
+        public Builder setJoinType(@JoinableValueType int joinType) {
+            mJoinType = joinType;
+            return this;
+        }
+
+        /** Set the total number of joined documents in a page. */
+        @NonNull
+        public Builder setNativeNumJoinedResultsCurrentPage(int nativeNumJoinedResultsCurrentPage) {
+            mNativeNumJoinedResultsCurrentPage = nativeNumJoinedResultsCurrentPage;
+            return this;
+        }
+
+        /** Sets time it takes to join documents together in icing. */
+        @NonNull
+        public Builder setNativeJoinLatencyMillis(int nativeJoinLatencyMillis) {
+            mNativeJoinLatencyMillis = nativeJoinLatencyMillis;
+            return this;
+        }
+
         /**
          * Constructs a new {@link SearchStats} from the contents of this
          * {@link SearchStats.Builder}.

diff --git a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SetSchemaStats.java b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SetSchemaStats.java
index c052eb8..6ff7d8e 100644
--- a/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SetSchemaStats.java
+++ b/appsearch/appsearch-local-storage/src/main/java/androidx/appsearch/localstorage/stats/SetSchemaStats.java

@@ -21,6 +21,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.appsearch.annotation.CanIgnoreReturnValue;
 import androidx.appsearch.app.AppSearchResult;
 import androidx.appsearch.stats.SchemaMigrationStats;
 import androidx.core.util.Preconditions;
@@ -224,7 +225,8 @@
     }
 
     /** Gets the type indicate how this set schema call relative to schema migration cases */
-    public @SchemaMigrationStats.SchemaMigrationCallType int getSchemaMigrationCallType() {
+    @SchemaMigrationStats.SchemaMigrationCallType
+    public int getSchemaMigrationCallType() {
         return mSchemaMigrationCallType;
     }
 
@@ -266,6 +268,7 @@
         }
 
         /** Sets the status of the SetSchema action. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setStatusCode(@AppSearchResult.ResultCode int statusCode) {
             mStatusCode = statusCode;
@@ -273,6 +276,7 @@
         }
 
         /** Sets total latency for the SetSchema action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalLatencyMillis(int totalLatencyMillis) {
             mTotalLatencyMillis = totalLatencyMillis;
@@ -280,6 +284,7 @@
         }
 
         /** Sets number of new types. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setNewTypeCount(int newTypeCount) {
             mNewTypeCount = newTypeCount;
@@ -287,6 +292,7 @@
         }
 
         /** Sets number of deleted types. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDeletedTypeCount(int deletedTypeCount) {
             mDeletedTypeCount = deletedTypeCount;
@@ -294,6 +300,7 @@
         }
 
         /** Sets number of compatible type changes. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setCompatibleTypeChangeCount(int compatibleTypeChangeCount) {
             mCompatibleTypeChangeCount = compatibleTypeChangeCount;
@@ -301,6 +308,7 @@
         }
 
         /** Sets number of index-incompatible type changes. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIndexIncompatibleTypeChangeCount(int indexIncompatibleTypeChangeCount) {
             mIndexIncompatibleTypeChangeCount = indexIncompatibleTypeChangeCount;
@@ -308,6 +316,7 @@
         }
 
         /** Sets number of backwards-incompatible type changes. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setBackwardsIncompatibleTypeChangeCount(
                 int backwardsIncompatibleTypeChangeCount) {
@@ -316,6 +325,7 @@
         }
 
         /** Sets total latency for the SetSchema in native action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setVerifyIncomingCallLatencyMillis(int verifyIncomingCallLatencyMillis) {
             mVerifyIncomingCallLatencyMillis = verifyIncomingCallLatencyMillis;
@@ -323,6 +333,7 @@
         }
 
         /** Sets total latency for the SetSchema in native action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setExecutorAcquisitionLatencyMillis(int executorAcquisitionLatencyMillis) {
             mExecutorAcquisitionLatencyMillis = executorAcquisitionLatencyMillis;
@@ -330,6 +341,7 @@
         }
 
         /** Sets latency for the rebuild schema object from bundle action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRebuildFromBundleLatencyMillis(int rebuildFromBundleLatencyMillis) {
             mRebuildFromBundleLatencyMillis = rebuildFromBundleLatencyMillis;
@@ -339,6 +351,7 @@
         /**
          * Sets latency for waiting to acquire the lock during Java function calls in milliseconds.
          */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setJavaLockAcquisitionLatencyMillis(int javaLockAcquisitionLatencyMillis) {
             mJavaLockAcquisitionLatencyMillis = javaLockAcquisitionLatencyMillis;
@@ -346,6 +359,7 @@
         }
 
         /** Sets latency for the rewrite the schema proto action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setRewriteSchemaLatencyMillis(int rewriteSchemaLatencyMillis) {
             mRewriteSchemaLatencyMillis = rewriteSchemaLatencyMillis;
@@ -353,6 +367,7 @@
         }
 
         /** Sets total latency for a single set schema in native action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setTotalNativeLatencyMillis(int totalNativeLatencyMillis) {
             mTotalNativeLatencyMillis = totalNativeLatencyMillis;
@@ -360,6 +375,7 @@
         }
 
         /** Sets latency for the apply visibility settings action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setVisibilitySettingLatencyMillis(int visibilitySettingLatencyMillis) {
             mVisibilitySettingLatencyMillis = visibilitySettingLatencyMillis;
@@ -367,6 +383,7 @@
         }
 
         /** Sets latency for converting to SetSchemaResponseInternal object in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setConvertToResponseLatencyMillis(int convertToResponseLatencyMillis) {
             mConvertToResponseLatencyMillis = convertToResponseLatencyMillis;
@@ -374,6 +391,7 @@
         }
 
         /** Sets latency for the dispatch change notification action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setDispatchChangeNotificationsLatencyMillis(
                 int dispatchChangeNotificationsLatencyMillis) {
@@ -382,6 +400,7 @@
         }
 
         /** Sets latency for the optimization action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setOptimizeLatencyMillis(int optimizeLatencyMillis) {
             mOptimizeLatencyMillis = optimizeLatencyMillis;
@@ -389,6 +408,7 @@
         }
 
         /** Sets whether this package is observed and we should prepare change notifications. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setIsPackageObserved(boolean isPackageObserved) {
             mIsPackageObserved = isPackageObserved;
@@ -396,6 +416,7 @@
         }
 
         /** Sets latency for the old schema action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setGetOldSchemaLatencyMillis(int getOldSchemaLatencyMillis) {
             mGetOldSchemaLatencyMillis = getOldSchemaLatencyMillis;
@@ -403,6 +424,7 @@
         }
 
         /** Sets latency for the registered observer action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setGetObserverLatencyMillis(int getObserverLatencyMillis) {
             mGetObserverLatencyMillis = getObserverLatencyMillis;
@@ -410,6 +432,7 @@
         }
 
         /** Sets latency for the preparing change notification action in milliseconds. */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setPreparingChangeNotificationLatencyMillis(
                 int preparingChangeNotificationLatencyMillis) {
@@ -418,6 +441,7 @@
         }
 
         /** Sets the type indicate how this set schema call relative to schema migration cases */
+        @CanIgnoreReturnValue
         @NonNull
         public Builder setSchemaMigrationCallType(
                 @SchemaMigrationStats.SchemaMigrationCallType int schemaMigrationCallType) {

diff --git a/appsearch/appsearch-platform-storage/lint-baseline.xml b/appsearch/appsearch-platform-storage/lint-baseline.xml
index d82c712..c09fd6a 100644
--- a/appsearch/appsearch-platform-storage/lint-baseline.xml
+++ b/appsearch/appsearch-platform-storage/lint-baseline.xml

@@ -3,7 +3,7 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
+        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR, AppSearchResult.RESULT_DENIED, but could be AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
         errorLine1="                            platformResult.getResultCode(), platformResult.getErrorMessage()));"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -12,7 +12,7 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
+        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR, AppSearchResult.RESULT_DENIED, but could be AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
         errorLine1="                                            namespaceResult.getResultCode(),"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -148,6 +148,24 @@
     <issue
         id="BanHideAnnotation"
         message="@hide is not allowed in Javadoc"
+        errorLine1="public class SearchSuggestionResultToPlatformConverter {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionResultToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="BanHideAnnotation"
+        message="@hide is not allowed in Javadoc"
+        errorLine1="public final class SearchSuggestionSpecToPlatformConverter {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionSpecToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="BanHideAnnotation"
+        message="@hide is not allowed in Javadoc"
         errorLine1="public final class SetSchemaRequestToPlatformConverter {"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -155,99 +173,9 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.GetSchemaResponseToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    platformResponse.getSchemaTypesNotDisplayedBySystem()) {"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.GetSchemaResponseToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    platformResponse.getRequiredPermissionsForSchemaTypeVisibility().entrySet()) {"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.GetSchemaResponseToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                platformResponse.getSchemaTypesVisibleToPackages();"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.GlobalSearchSessionImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlatformSession.getByDocumentId(packageName, databaseName,"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.GlobalSearchSessionImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlatformSession.getSchema("
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.GlobalSearchSessionImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mPlatformSession.registerObserverCallback("
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.GlobalSearchSessionImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mPlatformSession.unregisterObserverCallback(targetPackageName, frameworkCallback);"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.SearchResultToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                            platformMatchInfo.getSubmatchRange().getStart(),"
-        errorLine2="                                              ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.SearchResultToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                            platformMatchInfo.getSubmatchRange().getEnd()));"
-        errorLine2="                                              ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.appsearch.platformstorage.converter.SetSchemaRequestToPlatformConverter is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    platformBuilder.addRequiredPermissionsForSchemaTypeVisibility("
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java"/>
-    </issue>
-
-    <issue
         id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastT cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="                return BuildCompat.isAtLeastT();"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="                return BuildCompat.isAtLeastU();"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appsearch/platformstorage/FeaturesImpl.java"/>
@@ -255,20 +183,92 @@
 
     <issue
         id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastT cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="        if (BuildCompat.isAtLeastT()) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="                if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
         id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastT cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="        if (BuildCompat.isAtLeastT()) {"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="                if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            if (BuildCompat.isAtLeastU()) {"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            if (BuildCompat.isAtLeastU()) {"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="        if (BuildCompat.isAtLeastU()) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"/>
     </issue>
 
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="        if (!BuildCompat.isAtLeastU() &amp;&amp; mSearchSpec.getJoinSpec() != null) {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="                if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
+    </issue>
+
+    <issue
+        id="PrereleaseSdkCoreDependency"
+        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
+        errorLine1="            if (!BuildCompat.isAtLeastU()) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
+    </issue>
+
 </issues>

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/FeaturesImpl.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/FeaturesImpl.java
index 2f9336e..e52dd19 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/FeaturesImpl.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/FeaturesImpl.java

@@ -15,6 +15,9 @@
  */
 package androidx.appsearch.platformstorage;
 
+import android.annotation.SuppressLint;
+import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.appsearch.app.Features;
 import androidx.core.os.BuildCompat;
@@ -26,7 +29,8 @@
 final class FeaturesImpl implements Features {
 
     @Override
-    // TODO(b/201316758): Remove once BuildCompat.isAtLeastT is removed
+    // TODO(b/265311462): Remove these two lines once BuildCompat.isAtLeastU() is removed
+    @SuppressLint("NewApi")
     @BuildCompat.PrereleaseSdkCheck
     public boolean isFeatureSupported(@NonNull String feature) {
         switch (feature) {
@@ -40,37 +44,33 @@
             case Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK:
                 // fall through
             case Features.SEARCH_RESULT_MATCH_INFO_SUBMATCH:
-                // fall through
-                return BuildCompat.isAtLeastT();
+                return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;
 
             // Android U Features
-            case Features.SEARCH_SPEC_PROPERTY_WEIGHTS:
-                // TODO(b/203700301) : Update to reflect support in Android U+ once this feature is
-                // synced over into service-appsearch.
-                // fall through
-            case Features.TOKENIZER_TYPE_RFC822:
-                // TODO(b/259294369) : Update to reflect support in Android U+ once this feature is
-                // synced over into service-appsearch.
-                // fall through
-            case Features.NUMERIC_SEARCH:
-                // TODO(b/259744228) : Update to reflect support in Android U+ once this feature is
-                // synced over into service-appsearch.
-                // fall through
-            case SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION:
-                // TODO(b/261474063) : Update to reflect support in Android U+ once advanced
-                //  ranking becomes available.
-                // fall through
             case Features.JOIN_SPEC_AND_QUALIFIED_ID:
-                // TODO(b/256022027) : Update to reflect support in Android U+ once this feature is
-                // synced over into service-appsearch.
-                // fall through
-            case Features.VERBATIM_SEARCH:
-                // TODO(b/204333391) : Update to reflect support in Android U+ once this feature is
-                // synced over into service-appsearch.
                 // fall through
             case Features.LIST_FILTER_QUERY_LANGUAGE:
-                // TODO(b/208654892) : Update to reflect support in Android U+ once this feature is
+                // fall through
+            case Features.NUMERIC_SEARCH:
+                // fall through
+            case Features.SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION:
+                // fall through
+            case Features.SEARCH_SPEC_PROPERTY_WEIGHTS:
+                // fall through
+            case Features.SEARCH_SUGGESTION:
+                // fall through
+            case Features.TOKENIZER_TYPE_RFC822:
+                // fall through
+            case Features.VERBATIM_SEARCH:
+                return BuildCompat.isAtLeastU();
+
+            // Beyond Android U features
+            case Features.SEARCH_SPEC_GROUPING_TYPE_PER_SCHEMA:
+                // TODO(b/258715421) : Update to reflect support in Android U+ once this feature is
                 // synced over into service-appsearch.
+                // fall through
+            case Features.SCHEMA_SET_DELETION_PROPAGATION:
+                // TODO(b/268521214) : Update when feature is ready in service-appsearch.
                 return false;
             default:
                 return false;

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java
index 1ee50ec..dbebde8 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java

@@ -16,8 +16,11 @@
 package androidx.appsearch.platformstorage;
 
 import android.annotation.SuppressLint;
+import android.app.appsearch.AppSearchResult;
+import android.app.appsearch.BatchResultCallback;
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -52,9 +55,10 @@
 
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 /**
- * An implementation of {@link androidx.appsearch.app.GlobalSearchSession} which proxies to a
+ * An implementation of {@link GlobalSearchSession} which proxies to a
  * platform {@link android.app.appsearch.GlobalSearchSession}.
  *
  * @hide
@@ -80,7 +84,6 @@
         mFeatures = Preconditions.checkNotNull(features);
     }
 
-    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     @Override
     public ListenableFuture<AppSearchBatchResult<String, GenericDocument>> getByDocumentIdAsync(
@@ -95,14 +98,16 @@
         Preconditions.checkNotNull(request);
         ResolvableFuture<AppSearchBatchResult<String, GenericDocument>> future =
                 ResolvableFuture.create();
-        mPlatformSession.getByDocumentId(packageName, databaseName,
-                RequestToPlatformConverter.toPlatformGetByDocumentIdRequest(request),
-                mExecutor,
+        ApiHelperForT.getByDocumentId(mPlatformSession, packageName, databaseName,
+                RequestToPlatformConverter.toPlatformGetByDocumentIdRequest(request), mExecutor,
                 new BatchResultCallbackAdapter<>(
                         future, GenericDocumentToPlatformConverter::toJetpackGenericDocument));
         return future;
     }
 
+    // TODO(b/265311462): Remove these two lines once BuildCompat.isAtLeastU() is removed
+    @SuppressLint("NewApi")
+    @BuildCompat.PrereleaseSdkCheck
     @Override
     @NonNull
     public SearchResults search(
@@ -131,6 +136,8 @@
         return future;
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
     @BuildCompat.PrereleaseSdkCheck
     @NonNull
     @Override
@@ -144,10 +151,7 @@
                             + " is not supported on this AppSearch implementation.");
         }
         ResolvableFuture<GetSchemaResponse> future = ResolvableFuture.create();
-        mPlatformSession.getSchema(
-                packageName,
-                databaseName,
-                mExecutor,
+        ApiHelperForT.getSchema(mPlatformSession, packageName, databaseName, mExecutor,
                 result -> AppSearchResultToPlatformConverter.platformAppSearchResultToFuture(
                         result,
                         future,
@@ -161,9 +165,7 @@
         return mFeatures;
     }
 
-    // TODO(b/193494000): Remove these two lines once BuildCompat.isAtLeastT() is removed.
-    @SuppressLint("NewApi")
-    @BuildCompat.PrereleaseSdkCheck
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     @Override
     public void registerObserverCallback(
             @NonNull String targetPackageName,
@@ -213,10 +215,8 @@
             // Regardless of whether this stub was fresh or not, we have to register it again
             // because the user might be supplying a different spec.
             try {
-                mPlatformSession.registerObserverCallback(
-                        targetPackageName,
-                        ObserverSpecToPlatformConverter.toPlatformObserverSpec(spec),
-                        executor,
+                ApiHelperForT.registerObserverCallback(mPlatformSession, targetPackageName,
+                        ObserverSpecToPlatformConverter.toPlatformObserverSpec(spec), executor,
                         frameworkCallback);
             } catch (android.app.appsearch.exceptions.AppSearchException e) {
                 throw new AppSearchException((int) e.getResultCode(), e.getMessage(), e.getCause());
@@ -229,8 +229,6 @@
         }
     }
 
-    @SuppressLint("NewApi")
-    @BuildCompat.PrereleaseSdkCheck
     @Override
     public void unregisterObserverCallback(
             @NonNull String targetPackageName, @NonNull ObserverCallback observer)
@@ -253,7 +251,8 @@
             }
 
             try {
-                mPlatformSession.unregisterObserverCallback(targetPackageName, frameworkCallback);
+                ApiHelperForT.unregisterObserverCallback(mPlatformSession, targetPackageName,
+                        frameworkCallback);
             } catch (android.app.appsearch.exceptions.AppSearchException e) {
                 throw new AppSearchException((int) e.getResultCode(), e.getMessage(), e.getCause());
             }
@@ -267,4 +266,43 @@
     public void close() {
         mPlatformSession.close();
     }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private static class ApiHelperForT {
+        private ApiHelperForT() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static void getByDocumentId(android.app.appsearch.GlobalSearchSession platformSession,
+                String packageName, String databaseName,
+                android.app.appsearch.GetByDocumentIdRequest request, Executor executor,
+                BatchResultCallback<String, android.app.appsearch.GenericDocument> callback) {
+            platformSession.getByDocumentId(packageName, databaseName, request, executor, callback);
+        }
+
+        @DoNotInline
+        static void getSchema(android.app.appsearch.GlobalSearchSession platformSessions,
+                String packageName, String databaseName, Executor executor,
+                Consumer<AppSearchResult<android.app.appsearch.GetSchemaResponse>> callback) {
+            platformSessions.getSchema(packageName, databaseName, executor, callback);
+        }
+
+        @DoNotInline
+        static void registerObserverCallback(
+                android.app.appsearch.GlobalSearchSession platformSession, String targetPackageName,
+                android.app.appsearch.observer.ObserverSpec spec, Executor executor,
+                android.app.appsearch.observer.ObserverCallback observer)
+                throws android.app.appsearch.exceptions.AppSearchException {
+            platformSession.registerObserverCallback(targetPackageName, spec, executor, observer);
+        }
+
+        @DoNotInline
+        static void unregisterObserverCallback(
+                android.app.appsearch.GlobalSearchSession platformSession, String targetPackageName,
+                android.app.appsearch.observer.ObserverCallback observer)
+                throws android.app.appsearch.exceptions.AppSearchException {
+            platformSession.unregisterObserverCallback(targetPackageName, observer);
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java
index 6fde6d6..1217bf6 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java

@@ -58,13 +58,14 @@
         mExecutor = Preconditions.checkNotNull(executor);
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
     @SuppressLint("WrongConstant")
     @Override
     @NonNull
     @BuildCompat.PrereleaseSdkCheck
     public ListenableFuture<List<SearchResult>> getNextPageAsync() {
-        // TODO(b/256022027): add isAtLeastU check after Android U.
-        if (mSearchSpec.getJoinSpec() != null) {
+        if (!BuildCompat.isAtLeastU() && mSearchSpec.getJoinSpec() != null) {
             throw new UnsupportedOperationException("Searching with a SearchSpec containing a "
                     + "JoinSpec is not supported on this AppSearch implementation.");
         }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java
index 4e4f3db..f104e03 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java

@@ -15,8 +15,11 @@
  */
 package androidx.appsearch.platformstorage;
 
+import android.annotation.SuppressLint;
+import android.app.appsearch.AppSearchResult;
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
@@ -43,6 +46,8 @@
 import androidx.appsearch.platformstorage.converter.RequestToPlatformConverter;
 import androidx.appsearch.platformstorage.converter.ResponseToPlatformConverter;
 import androidx.appsearch.platformstorage.converter.SearchSpecToPlatformConverter;
+import androidx.appsearch.platformstorage.converter.SearchSuggestionResultToPlatformConverter;
+import androidx.appsearch.platformstorage.converter.SearchSuggestionSpecToPlatformConverter;
 import androidx.appsearch.platformstorage.converter.SetSchemaRequestToPlatformConverter;
 import androidx.appsearch.platformstorage.util.BatchResultCallbackAdapter;
 import androidx.concurrent.futures.ResolvableFuture;
@@ -54,6 +59,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 /**
  * An implementation of {@link AppSearchSession} which proxies to a platform
@@ -76,9 +82,11 @@
         mFeatures = Preconditions.checkNotNull(features);
     }
 
+    // TODO(b/265311462): Remove these two lines once BuildCompat.isAtLeastU() is removed
+    @SuppressLint("NewApi")
+    @BuildCompat.PrereleaseSdkCheck
     @Override
     @NonNull
-    @BuildCompat.PrereleaseSdkCheck
     public ListenableFuture<SetSchemaResponse> setSchemaAsync(@NonNull SetSchemaRequest request) {
         Preconditions.checkNotNull(request);
         ResolvableFuture<SetSchemaResponse> future = ResolvableFuture.create();
@@ -93,9 +101,11 @@
         return future;
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @Override
     @NonNull
-    @BuildCompat.PrereleaseSdkCheck
     public ListenableFuture<GetSchemaResponse> getSchemaAsync() {
         ResolvableFuture<GetSchemaResponse> future = ResolvableFuture.create();
         mPlatformSession.getSchema(
@@ -146,6 +156,9 @@
         return future;
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @Override
     @NonNull
     public SearchResults search(
@@ -160,13 +173,34 @@
         return new SearchResultsImpl(platformSearchResults, searchSpec, mExecutor);
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     @Override
     public ListenableFuture<List<SearchSuggestionResult>> searchSuggestionAsync(
-            @NonNull String suggestionQueryExpression, @NonNull SearchSuggestionSpec searchSpec) {
-        // TODO(b/227356108) Implement this after we export to framework.
-        throw new UnsupportedOperationException(
-                "Search Suggestion is not supported on this AppSearch implementation.");
+            @NonNull String suggestionQueryExpression,
+            @NonNull SearchSuggestionSpec searchSuggestionSpec) {
+        Preconditions.checkNotNull(suggestionQueryExpression);
+        Preconditions.checkNotNull(searchSuggestionSpec);
+        if (Build.VERSION.SDK_INT >= 34) {
+            ResolvableFuture<List<SearchSuggestionResult>> future = ResolvableFuture.create();
+            ApiHelperForU.searchSuggestion(
+                    mPlatformSession,
+                    suggestionQueryExpression,
+                    SearchSuggestionSpecToPlatformConverter
+                            .toPlatformSearchSuggestionSpec(searchSuggestionSpec),
+                    mExecutor,
+                    result -> AppSearchResultToPlatformConverter.platformAppSearchResultToFuture(
+                            result,
+                            future,
+                            SearchSuggestionResultToPlatformConverter
+                                    ::toJetpackSearchSuggestionResults));
+            return future;
+        } else {
+            throw new UnsupportedOperationException(
+                    "Search Suggestion is not supported on this AppSearch implementation.");
+        }
     }
 
     @Override
@@ -195,9 +229,11 @@
         return future;
     }
 
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @Override
     @NonNull
-    @BuildCompat.PrereleaseSdkCheck
     public ListenableFuture<Void> removeAsync(
             @NonNull String queryExpression, @NonNull SearchSpec searchSpec) {
         Preconditions.checkNotNull(queryExpression);
@@ -295,4 +331,23 @@
     public void close() {
         mPlatformSession.close();
     }
+
+    @RequiresApi(34)
+    static class ApiHelperForU {
+        private ApiHelperForU() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static void searchSuggestion(
+                @NonNull android.app.appsearch.AppSearchSession appSearchSession,
+                @NonNull String suggestionQueryExpression,
+                @NonNull android.app.appsearch.SearchSuggestionSpec searchSuggestionSpec,
+                @NonNull Executor executor,
+                @NonNull Consumer<AppSearchResult<
+                        List<android.app.appsearch.SearchSuggestionResult>>> callback) {
+            appSearchSession.searchSuggestion(suggestionQueryExpression, searchSuggestionSpec,
+                    executor, callback);
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java
index 05575ce..27b1c19 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java

@@ -18,6 +18,7 @@
 
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
@@ -43,8 +44,10 @@
      * Translates a platform {@link android.app.appsearch.GetSchemaResponse} into a jetpack
      * {@link GetSchemaResponse}.
      */
-    @NonNull
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
     @BuildCompat.PrereleaseSdkCheck
+    @NonNull
     public static GetSchemaResponse toJetpackGetSchemaResponse(
             @NonNull android.app.appsearch.GetSchemaResponse platformResponse) {
         Preconditions.checkNotNull(platformResponse);
@@ -60,17 +63,18 @@
             jetpackBuilder.addSchema(SchemaToPlatformConverter.toJetpackSchema(platformSchema));
         }
         jetpackBuilder.setVersion(platformResponse.getVersion());
-        if (BuildCompat.isAtLeastT()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             // Convert schemas not displayed by system
             for (String schemaTypeNotDisplayedBySystem :
-                    platformResponse.getSchemaTypesNotDisplayedBySystem()) {
+                    ApiHelperForT.getSchemaTypesNotDisplayedBySystem(platformResponse)) {
                 jetpackBuilder.addSchemaTypeNotDisplayedBySystem(schemaTypeNotDisplayedBySystem);
             }
             // Convert schemas visible to packages
             convertSchemasVisibleToPackages(platformResponse, jetpackBuilder);
             // Convert schemas visible to permissions
             for (Map.Entry<String, Set<Set<Integer>>> entry :
-                    platformResponse.getRequiredPermissionsForSchemaTypeVisibility().entrySet()) {
+                    ApiHelperForT.getRequiredPermissionsForSchemaTypeVisibility(platformResponse)
+                            .entrySet()) {
                 jetpackBuilder.setRequiredPermissionsForSchemaTypeVisibility(entry.getKey(),
                         entry.getValue());
             }
@@ -90,7 +94,7 @@
         //  incorrectly returns {@code null} in some prerelease versions of Android T. Remove
         //  this workaround after the issue is fixed in T.
         Map<String, Set<android.app.appsearch.PackageIdentifier>> schemaTypesVisibleToPackages =
-                platformResponse.getSchemaTypesVisibleToPackages();
+                ApiHelperForT.getSchemaTypesVisibleToPackage(platformResponse);
         if (schemaTypesVisibleToPackages != null) {
             for (Map.Entry<String, Set<android.app.appsearch.PackageIdentifier>> entry
                     : schemaTypesVisibleToPackages.entrySet()) {
@@ -107,4 +111,30 @@
             }
         }
     }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private static class ApiHelperForT {
+        private ApiHelperForT() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static Set<String> getSchemaTypesNotDisplayedBySystem(
+                android.app.appsearch.GetSchemaResponse platformResponse) {
+            return platformResponse.getSchemaTypesNotDisplayedBySystem();
+        }
+
+        @DoNotInline
+        static Map<String, Set<android.app.appsearch.PackageIdentifier>>
+                getSchemaTypesVisibleToPackage(
+                    android.app.appsearch.GetSchemaResponse platformResponse) {
+            return platformResponse.getSchemaTypesVisibleToPackages();
+        }
+
+        @DoNotInline
+        static Map<String, Set<Set<Integer>>> getRequiredPermissionsForSchemaTypeVisibility(
+                android.app.appsearch.GetSchemaResponse platformResponse) {
+            return platformResponse.getRequiredPermissionsForSchemaTypeVisibility();
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/JoinSpecToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/JoinSpecToPlatformConverter.java
new file mode 100644
index 0000000..9696cec
--- /dev/null
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/JoinSpecToPlatformConverter.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.platformstorage.converter;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.JoinSpec;
+import androidx.core.os.BuildCompat;
+import androidx.core.util.Preconditions;
+
+/**
+ * Translates between Platform and Jetpack versions of {@link JoinSpec}.
+ */
+// TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once
+//  SearchSpecToPlatformConverter.toPlatformSearchSpec() removes it. Also, replace literal '34' with
+//  Build.VERSION_CODES.UPSIDE_DOWN_CAKE once the SDK_INT is finalized.
[email protected]
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+@RequiresApi(34)
+public class JoinSpecToPlatformConverter {
+    private JoinSpecToPlatformConverter() {}
+
+    /**
+     * Translates a Jetpack {@link JoinSpec} into a platform {@link android.app.appsearch.JoinSpec}.
+     */
+    @SuppressLint("WrongConstant")
+    @NonNull
+    public static android.app.appsearch.JoinSpec toPlatformJoinSpec(@NonNull JoinSpec jetpackSpec) {
+        Preconditions.checkNotNull(jetpackSpec);
+        return new android.app.appsearch.JoinSpec.Builder(jetpackSpec.getChildPropertyExpression())
+                .setNestedSearch(
+                        jetpackSpec.getNestedQuery(),
+                        SearchSpecToPlatformConverter.toPlatformSearchSpec(
+                                jetpackSpec.getNestedSearchSpec()))
+                .setMaxJoinedResultCount(jetpackSpec.getMaxJoinedResultCount())
+                .setAggregationScoringStrategy(jetpackSpec.getAggregationScoringStrategy())
+                .build();
+    }
+}

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java
index eba43cf..9015bef 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java

@@ -19,16 +19,18 @@
 import android.annotation.SuppressLint;
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.appsearch.app.AppSearchSchema;
+import androidx.core.os.BuildCompat;
 import androidx.core.util.Preconditions;
 
 import java.util.List;
 
 /**
- * Translates a jetpack {@link androidx.appsearch.app.AppSearchSchema} into a platform
+ * Translates a jetpack {@link AppSearchSchema} into a platform
  * {@link android.app.appsearch.AppSearchSchema}.
  * @hide
  */
@@ -38,9 +40,12 @@
     private SchemaToPlatformConverter() {}
 
     /**
-     * Translates a jetpack {@link androidx.appsearch.app.AppSearchSchema} into a platform
+     * Translates a jetpack {@link AppSearchSchema} into a platform
      * {@link android.app.appsearch.AppSearchSchema}.
      */
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once
+    //  toPlatformProperty() doesn't have it either.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     public static android.app.appsearch.AppSearchSchema toPlatformSchema(
             @NonNull AppSearchSchema jetpackSchema) {
@@ -58,8 +63,11 @@
 
     /**
      * Translates a platform {@link android.app.appsearch.AppSearchSchema} to a jetpack
-     * {@link androidx.appsearch.app.AppSearchSchema}.
+     * {@link AppSearchSchema}.
      */
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     public static AppSearchSchema toJetpackSchema(
             @NonNull android.app.appsearch.AppSearchSchema platformSchema) {
@@ -78,6 +86,9 @@
     // Most stringProperty.get calls cause WrongConstant lint errors because the methods are not
     // defined as returning the same constants as the corresponding setter expects, but they do
     @SuppressLint("WrongConstant")
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     private static android.app.appsearch.AppSearchSchema.PropertyConfig toPlatformProperty(
             @NonNull AppSearchSchema.PropertyConfig jetpackProperty) {
@@ -85,34 +96,47 @@
         if (jetpackProperty instanceof AppSearchSchema.StringPropertyConfig) {
             AppSearchSchema.StringPropertyConfig stringProperty =
                     (AppSearchSchema.StringPropertyConfig) jetpackProperty;
-            // TODO(b/256022027): add isAtLeastU check to allow JOINABLE_VALUE_TYPE_QUALIFIED_ID
-            //   after Android U, and set joinable value type to PropertyConfig.
-            if (stringProperty.getJoinableValueType()
-                    == AppSearchSchema.StringPropertyConfig.JOINABLE_VALUE_TYPE_QUALIFIED_ID) {
-                throw new UnsupportedOperationException(
-                        "StringPropertyConfig.JOINABLE_VALUE_TYPE_QUALIFIED_ID is not supported on "
-                                + "this AppSearch implementation.");
-            }
-            return new android.app.appsearch.AppSearchSchema.StringPropertyConfig.Builder(
+            android.app.appsearch.AppSearchSchema.StringPropertyConfig.Builder platformBuilder =
+                    new android.app.appsearch.AppSearchSchema.StringPropertyConfig.Builder(
                     stringProperty.getName())
                     .setCardinality(stringProperty.getCardinality())
                     .setIndexingType(stringProperty.getIndexingType())
-                    .setTokenizerType(stringProperty.getTokenizerType())
-                    .build();
+                    .setTokenizerType(stringProperty.getTokenizerType());
+            if (stringProperty.getDeletionPropagation()) {
+                // TODO(b/268521214): Update once deletion propagation is available.
+                throw new UnsupportedOperationException("Setting deletion propagation is not "
+                        + "supported on this AppSearch implementation.");
+            }
+
+            if (stringProperty.getJoinableValueType()
+                    == AppSearchSchema.StringPropertyConfig.JOINABLE_VALUE_TYPE_QUALIFIED_ID) {
+                if (!BuildCompat.isAtLeastU()) {
+                    throw new UnsupportedOperationException(
+                        "StringPropertyConfig.JOINABLE_VALUE_TYPE_QUALIFIED_ID is not supported"
+                                + " on this AppSearch implementation.");
+                }
+                ApiHelperForU.setJoinableValueType(platformBuilder,
+                        stringProperty.getJoinableValueType());
+            }
+            return platformBuilder.build();
         } else if (jetpackProperty instanceof AppSearchSchema.LongPropertyConfig) {
             AppSearchSchema.LongPropertyConfig longProperty =
                     (AppSearchSchema.LongPropertyConfig) jetpackProperty;
-            // TODO(b/259744228): add isAtLeastU check to allow INDEXING_TYPE_RANGE after Android U.
+            android.app.appsearch.AppSearchSchema.LongPropertyConfig.Builder longPropertyBuilder =
+                    new android.app.appsearch.AppSearchSchema.LongPropertyConfig.Builder(
+                    jetpackProperty.getName())
+                    .setCardinality(jetpackProperty.getCardinality());
             if (longProperty.getIndexingType()
                     == AppSearchSchema.LongPropertyConfig.INDEXING_TYPE_RANGE) {
-                throw new UnsupportedOperationException(
-                    "LongProperty.INDEXING_TYPE_RANGE is not supported on this AppSearch "
-                            + "implementation.");
+                if (!BuildCompat.isAtLeastU()) {
+                    throw new UnsupportedOperationException(
+                        "LongProperty.INDEXING_TYPE_RANGE is not supported on this AppSearch "
+                                + "implementation.");
+                }
+                ApiHelperForU.setIndexingType(
+                        longPropertyBuilder, longProperty.getIndexingType());
             }
-            return new android.app.appsearch.AppSearchSchema.LongPropertyConfig.Builder(
-                    jetpackProperty.getName())
-                    .setCardinality(jetpackProperty.getCardinality())
-                    .build();
+            return longPropertyBuilder.build();
         } else if (jetpackProperty instanceof AppSearchSchema.DoublePropertyConfig) {
             return new android.app.appsearch.AppSearchSchema.DoublePropertyConfig.Builder(
                     jetpackProperty.getName())
@@ -145,6 +169,9 @@
     // Most stringProperty.get calls cause WrongConstant lint errors because the methods are not
     // defined as returning the same constants as the corresponding setter expects, but they do
     @SuppressLint("WrongConstant")
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     private static AppSearchSchema.PropertyConfig toJetpackProperty(
             @NonNull android.app.appsearch.AppSearchSchema.PropertyConfig platformProperty) {
@@ -153,16 +180,28 @@
                 instanceof android.app.appsearch.AppSearchSchema.StringPropertyConfig) {
             android.app.appsearch.AppSearchSchema.StringPropertyConfig stringProperty =
                     (android.app.appsearch.AppSearchSchema.StringPropertyConfig) platformProperty;
-            return new AppSearchSchema.StringPropertyConfig.Builder(stringProperty.getName())
-                    .setCardinality(stringProperty.getCardinality())
-                    .setIndexingType(stringProperty.getIndexingType())
-                    .setTokenizerType(stringProperty.getTokenizerType())
-                    .build();
+            AppSearchSchema.StringPropertyConfig.Builder jetpackBuilder =
+                    new AppSearchSchema.StringPropertyConfig.Builder(stringProperty.getName())
+                            .setCardinality(stringProperty.getCardinality())
+                            .setIndexingType(stringProperty.getIndexingType())
+                            .setTokenizerType(stringProperty.getTokenizerType());
+            if (BuildCompat.isAtLeastU()) {
+                jetpackBuilder.setJoinableValueType(
+                        ApiHelperForU.getJoinableValueType(stringProperty));
+            }
+            return jetpackBuilder.build();
         } else if (platformProperty
                 instanceof android.app.appsearch.AppSearchSchema.LongPropertyConfig) {
-            return new AppSearchSchema.LongPropertyConfig.Builder(platformProperty.getName())
-                    .setCardinality(platformProperty.getCardinality())
-                    .build();
+            android.app.appsearch.AppSearchSchema.LongPropertyConfig longProperty =
+                    (android.app.appsearch.AppSearchSchema.LongPropertyConfig) platformProperty;
+            AppSearchSchema.LongPropertyConfig.Builder jetpackBuilder =
+                    new AppSearchSchema.LongPropertyConfig.Builder(longProperty.getName())
+                            .setCardinality(longProperty.getCardinality());
+            if (BuildCompat.isAtLeastU()) {
+                jetpackBuilder.setIndexingType(
+                        ApiHelperForU.getIndexingType(longProperty));
+            }
+            return jetpackBuilder.build();
         } else if (platformProperty
                 instanceof android.app.appsearch.AppSearchSchema.DoublePropertyConfig) {
             return new AppSearchSchema.DoublePropertyConfig.Builder(platformProperty.getName())
@@ -194,4 +233,47 @@
                             + ": " + platformProperty);
         }
     }
+
+    // TODO(b/265311462): Replace literal '34' with Build.VERSION_CODES.UPSIDE_DOWN_CAKE when the
+    // SDK_INT is finalized.
+    @RequiresApi(34)
+    private static class ApiHelperForU {
+        private ApiHelperForU() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static void setJoinableValueType(
+                android.app.appsearch.AppSearchSchema.StringPropertyConfig.Builder builder,
+                @AppSearchSchema.StringPropertyConfig.JoinableValueType int joinableValueType) {
+            builder.setJoinableValueType(joinableValueType);
+        }
+
+        // Most stringProperty.get calls cause WrongConstant lint errors because the methods are not
+        // defined as returning the same constants as the corresponding setter expects, but they do
+        @SuppressLint("WrongConstant")
+        @DoNotInline
+        @AppSearchSchema.StringPropertyConfig.JoinableValueType
+        static int getJoinableValueType(
+                android.app.appsearch.AppSearchSchema.StringPropertyConfig stringPropertyConfig) {
+            return stringPropertyConfig.getJoinableValueType();
+        }
+
+        @DoNotInline
+        static void setIndexingType(
+                android.app.appsearch.AppSearchSchema.LongPropertyConfig.Builder builder,
+                @AppSearchSchema.LongPropertyConfig.IndexingType int longIndexingType) {
+            builder.setIndexingType(longIndexingType);
+        }
+
+        // Most LongProperty.get calls cause WrongConstant lint errors because the methods are not
+        // defined as returning the same constants as the corresponding setter expects, but they do
+        @SuppressLint("WrongConstant")
+        @DoNotInline
+        @AppSearchSchema.LongPropertyConfig.IndexingType
+        static int getIndexingType(
+                android.app.appsearch.AppSearchSchema.LongPropertyConfig longPropertyConfig) {
+            return longPropertyConfig.getIndexingType();
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java
index 707234d..a36e9cf 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java

@@ -18,6 +18,7 @@
 
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
@@ -38,6 +39,8 @@
     private SearchResultToPlatformConverter() {}
 
     /** Translates from Platform to Jetpack versions of {@link SearchResult}. */
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
     @BuildCompat.PrereleaseSdkCheck
     @NonNull
     public static SearchResult toJetpackSearchResult(
@@ -55,10 +58,15 @@
             SearchResult.MatchInfo jetpackMatchInfo = toJetpackMatchInfo(platformMatches.get(i));
             builder.addMatchInfo(jetpackMatchInfo);
         }
+        if (BuildCompat.isAtLeastU()) {
+            for (android.app.appsearch.SearchResult joinedResult :
+                    ApiHelperForU.getJoinedResults(platformResult)) {
+                builder.addJoinedResult(toJetpackSearchResult(joinedResult));
+            }
+        }
         return builder.build();
     }
 
-    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     private static SearchResult.MatchInfo toJetpackMatchInfo(
             @NonNull android.app.appsearch.SearchResult.MatchInfo platformMatchInfo) {
@@ -73,12 +81,46 @@
                         new SearchResult.MatchRange(
                                 platformMatchInfo.getSnippetRange().getStart(),
                                 platformMatchInfo.getSnippetRange().getEnd()));
-        if (BuildCompat.isAtLeastT()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             builder.setSubmatchRange(
                     new SearchResult.MatchRange(
-                            platformMatchInfo.getSubmatchRange().getStart(),
-                            platformMatchInfo.getSubmatchRange().getEnd()));
+                            ApiHelperForT.getSubmatchRangeStart(platformMatchInfo),
+                            ApiHelperForT.getSubmatchRangeEnd(platformMatchInfo)));
         }
         return builder.build();
     }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private static class ApiHelperForT {
+        private ApiHelperForT() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static int getSubmatchRangeStart(@NonNull
+                android.app.appsearch.SearchResult.MatchInfo platformMatchInfo) {
+            return platformMatchInfo.getSubmatchRange().getStart();
+        }
+
+        @DoNotInline
+        static int getSubmatchRangeEnd(@NonNull
+                android.app.appsearch.SearchResult.MatchInfo platformMatchInfo) {
+            return platformMatchInfo.getSubmatchRange().getEnd();
+        }
+    }
+
+    // TODO(b/265311462): Replace literal '34' with Build.VERSION_CODES.UPSIDE_DOWN_CAKE when the
+    // SDK_INT is finalized.
+    @RequiresApi(34)
+    private static class ApiHelperForU {
+        private ApiHelperForU() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static List<android.app.appsearch.SearchResult> getJoinedResults(@NonNull
+                android.app.appsearch.SearchResult result) {
+            return result.getJoinedResults();
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java
index cc2bd0a..ea743a0 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java

@@ -19,11 +19,14 @@
 import android.annotation.SuppressLint;
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.appsearch.app.Features;
+import androidx.appsearch.app.JoinSpec;
 import androidx.appsearch.app.SearchSpec;
+import androidx.core.os.BuildCompat;
 import androidx.core.util.Preconditions;
 
 import java.util.List;
@@ -44,35 +47,49 @@
     // Most jetpackSearchSpec.get calls cause WrongConstant lint errors because the methods are not
     // defined as returning the same constants as the corresponding setter expects, but they do
     @SuppressLint("WrongConstant")
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
+    @BuildCompat.PrereleaseSdkCheck
     @NonNull
     public static android.app.appsearch.SearchSpec toPlatformSearchSpec(
             @NonNull SearchSpec jetpackSearchSpec) {
         Preconditions.checkNotNull(jetpackSearchSpec);
 
-        if (!jetpackSearchSpec.getAdvancedRankingExpression().isEmpty()) {
-            // TODO(b/261474063): Remove this once advanced ranking becomes available.
-            throw new UnsupportedOperationException(
-                    Features.SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION
-                            + " is not available on this AppSearch implementation.");
-        }
-
         android.app.appsearch.SearchSpec.Builder platformBuilder =
                 new android.app.appsearch.SearchSpec.Builder();
 
+        if (!jetpackSearchSpec.getAdvancedRankingExpression().isEmpty()) {
+            if (!BuildCompat.isAtLeastU()) {
+                throw new UnsupportedOperationException(
+                        Features.SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION
+                                + " is not available on this AppSearch implementation.");
+            }
+            ApiHelperForU.setRankingStrategy(
+                    platformBuilder, jetpackSearchSpec.getAdvancedRankingExpression());
+        } else {
+            platformBuilder.setRankingStrategy(jetpackSearchSpec.getRankingStrategy());
+        }
+
         platformBuilder
                 .setTermMatch(jetpackSearchSpec.getTermMatch())
                 .addFilterSchemas(jetpackSearchSpec.getFilterSchemas())
                 .addFilterNamespaces(jetpackSearchSpec.getFilterNamespaces())
                 .addFilterPackageNames(jetpackSearchSpec.getFilterPackageNames())
                 .setResultCountPerPage(jetpackSearchSpec.getResultCountPerPage())
-                .setRankingStrategy(jetpackSearchSpec.getRankingStrategy())
                 .setOrder(jetpackSearchSpec.getOrder())
                 .setSnippetCount(jetpackSearchSpec.getSnippetCount())
                 .setSnippetCountPerProperty(jetpackSearchSpec.getSnippetCountPerProperty())
                 .setMaxSnippetSize(jetpackSearchSpec.getMaxSnippetSize());
-        //TODO(b/262512396): add the enabledFeatures set from the SearchSpec once it is synced
-        // across to platform.
         if (jetpackSearchSpec.getResultGroupingTypeFlags() != 0) {
+            // Feature SEARCH_SPEC_GROUPING_TYPE_PER_SCHEMA is only supported on Android U.
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
+                if ((jetpackSearchSpec.getResultGroupingTypeFlags()
+                        & SearchSpec.GROUPING_TYPE_PER_SCHEMA) != 0) {
+                    throw new UnsupportedOperationException(
+                        Features.SEARCH_SPEC_GROUPING_TYPE_PER_SCHEMA
+                            + " is not available on this AppSearch implementation.");
+                }
+            }
             platformBuilder.setResultGrouping(
                     jetpackSearchSpec.getResultGroupingTypeFlags(),
                     jetpackSearchSpec.getResultGroupingLimit());
@@ -82,13 +99,82 @@
             platformBuilder.addProjection(projection.getKey(), projection.getValue());
         }
 
-        // TODO(b/203700301) : Update to reflect support in Android U+ once this
-        // feature is synced over into service-appsearch.
         if (!jetpackSearchSpec.getPropertyWeights().isEmpty()) {
-            throw new UnsupportedOperationException(
-                    "Property weights are not supported with this backend/Android API level "
-                            + "combination.");
+            if (!BuildCompat.isAtLeastU()) {
+                throw new UnsupportedOperationException(
+                        "Property weights are not supported with this backend/Android API level "
+                                + "combination.");
+            }
+            ApiHelperForU.setPropertyWeights(platformBuilder,
+                    jetpackSearchSpec.getPropertyWeights());
+        }
+
+        if (!jetpackSearchSpec.getEnabledFeatures().isEmpty()) {
+            if (jetpackSearchSpec.isNumericSearchEnabled()
+                    || jetpackSearchSpec.isVerbatimSearchEnabled()
+                    || jetpackSearchSpec.isListFilterQueryLanguageEnabled()) {
+                if (!BuildCompat.isAtLeastU()) {
+                    throw new UnsupportedOperationException(
+                            "Advanced query features (NUMERIC_SEARCH, VERBATIM_SEARCH and "
+                                    + "LIST_FILTER_QUERY_LANGUAGE) are not supported with this "
+                                    + "backend/Android API level combination.");
+                }
+                ApiHelperForU.copyEnabledFeatures(platformBuilder, jetpackSearchSpec);
+            }
+        }
+
+        if (jetpackSearchSpec.getJoinSpec() != null) {
+            if (!BuildCompat.isAtLeastU()) {
+                throw new UnsupportedOperationException("JoinSpec is not available on this "
+                        + "AppSearch implementation.");
+            }
+            ApiHelperForU.setJoinSpec(platformBuilder, jetpackSearchSpec.getJoinSpec());
         }
         return platformBuilder.build();
     }
+
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed. Also, replace literal '34' with
+    //  Build.VERSION_CODES.UPSIDE_DOWN_CAKE once the SDK_INT is finalized.
+    @BuildCompat.PrereleaseSdkCheck
+    @RequiresApi(34)
+    private static class ApiHelperForU {
+        private ApiHelperForU() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static void setJoinSpec(@NonNull android.app.appsearch.SearchSpec.Builder builder,
+                JoinSpec jetpackJoinSpec) {
+            builder.setJoinSpec(JoinSpecToPlatformConverter.toPlatformJoinSpec(jetpackJoinSpec));
+        }
+
+        @DoNotInline
+        static void setRankingStrategy(@NonNull android.app.appsearch.SearchSpec.Builder builder,
+                @NonNull String rankingExpression) {
+            builder.setRankingStrategy(rankingExpression);
+        }
+
+        @DoNotInline
+        static void copyEnabledFeatures(@NonNull android.app.appsearch.SearchSpec.Builder builder,
+                @NonNull SearchSpec jetpackSpec) {
+            if (jetpackSpec.isNumericSearchEnabled()) {
+                builder.setNumericSearchEnabled(true);
+            }
+            if (jetpackSpec.isVerbatimSearchEnabled()) {
+                builder.setVerbatimSearchEnabled(true);
+            }
+            if (jetpackSpec.isListFilterQueryLanguageEnabled()) {
+                builder.setListFilterQueryLanguageEnabled(true);
+            }
+        }
+
+        @DoNotInline
+        static void setPropertyWeights(@NonNull android.app.appsearch.SearchSpec.Builder builder,
+                @NonNull Map<String, Map<String, Double>> propertyWeightsMap) {
+            for (Map.Entry<String, Map<String, Double>> entry : propertyWeightsMap.entrySet()) {
+                builder.setPropertyWeights(entry.getKey(), entry.getValue());
+            }
+        }
+    }
 }

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionResultToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionResultToPlatformConverter.java
new file mode 100644
index 0000000..beebb35
--- /dev/null
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionResultToPlatformConverter.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.platformstorage.converter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.SearchSuggestionResult;
+import androidx.core.util.Preconditions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Translates between Platform and Jetpack versions of {@link SearchSuggestionResult}.
+ *
+ * @hide
+ */
+// TODO(b/227356108) replace literal '34' with Build.VERSION_CODES.U once the SDK_INT is finalized.
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@RequiresApi(34)
+public class SearchSuggestionResultToPlatformConverter {
+    private SearchSuggestionResultToPlatformConverter() {}
+
+    /** Translates from Platform to Jetpack versions of {@linkSearchSuggestionResult}   */
+    @NonNull
+    public static List<SearchSuggestionResult> toJetpackSearchSuggestionResults(
+            @NonNull List<android.app.appsearch.SearchSuggestionResult>
+                    platformSearchSuggestionResults) {
+        Preconditions.checkNotNull(platformSearchSuggestionResults);
+        List<SearchSuggestionResult> jetpackSearchSuggestionResults =
+                new ArrayList<>(platformSearchSuggestionResults.size());
+        for (int i = 0; i < platformSearchSuggestionResults.size(); i++) {
+            jetpackSearchSuggestionResults.add(new SearchSuggestionResult.Builder()
+                    .setSuggestedResult(platformSearchSuggestionResults.get(i).getSuggestedResult())
+                    .build());
+        }
+        return jetpackSearchSuggestionResults;
+    }
+}

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionSpecToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionSpecToPlatformConverter.java
new file mode 100644
index 0000000..86f20af
--- /dev/null
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SearchSuggestionSpecToPlatformConverter.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.platformstorage.converter;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.SearchSuggestionSpec;
+import androidx.core.util.Preconditions;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Translates between Platform and Jetpack versions of {@link SearchSuggestionSpec}.
+ *
+ * @hide
+ */
+// TODO(b/227356108) replace literal '34' with Build.VERSION_CODES.U once the SDK_INT is finalized.
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@RequiresApi(34)
+public final class SearchSuggestionSpecToPlatformConverter {
+    private SearchSuggestionSpecToPlatformConverter() {
+    }
+
+    /** Translates from Jetpack to Platform version of {@link SearchSuggestionSpec}. */
+    // Most jetpackSearchSuggestionSpec.get calls cause WrongConstant lint errors because the
+    // methods are not defined as returning the same constants as the corresponding setter
+    // expects, but they do
+    @SuppressLint("WrongConstant")
+    @NonNull
+    public static android.app.appsearch.SearchSuggestionSpec toPlatformSearchSuggestionSpec(
+            @NonNull SearchSuggestionSpec jetpackSearchSuggestionSpec) {
+        Preconditions.checkNotNull(jetpackSearchSuggestionSpec);
+
+        android.app.appsearch.SearchSuggestionSpec.Builder platformBuilder =
+                new android.app.appsearch.SearchSuggestionSpec.Builder(
+                        jetpackSearchSuggestionSpec.getMaximumResultCount());
+
+        platformBuilder
+                .addFilterNamespaces(jetpackSearchSuggestionSpec.getFilterNamespaces())
+                .addFilterSchemas(jetpackSearchSuggestionSpec.getFilterSchemas())
+                .setRankingStrategy(jetpackSearchSuggestionSpec.getRankingStrategy());
+        for (Map.Entry<String, List<String>> documentIdFilters :
+                jetpackSearchSuggestionSpec.getFilterDocumentIds().entrySet()) {
+            platformBuilder.addFilterDocumentIds(documentIdFilters.getKey(),
+                    documentIdFilters.getValue());
+        }
+        return platformBuilder.build();
+    }
+}

diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java
index 48c3ede..0ca4dac 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java

@@ -18,6 +18,7 @@
 
 import android.os.Build;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
@@ -47,6 +48,8 @@
      * Translates a jetpack {@link SetSchemaRequest} into a platform
      * {@link android.app.appsearch.SetSchemaRequest}.
      */
+    // TODO(b/265311462): Remove BuildCompat.PrereleaseSdkCheck annotation once usage of
+    //  BuildCompat.isAtLeastU() is removed.
     @BuildCompat.PrereleaseSdkCheck
     @NonNull
     public static android.app.appsearch.SetSchemaRequest toPlatformSetSchemaRequest(
@@ -82,7 +85,7 @@
             for (Map.Entry<String, Set<Set<Integer>>> entry :
                     jetpackRequest.getRequiredPermissionsForSchemaTypeVisibility().entrySet()) {
                 for (Set<Integer> permissionGroup : entry.getValue()) {
-                    platformBuilder.addRequiredPermissionsForSchemaTypeVisibility(
+                    ApiHelperForT.addRequiredPermissionsForSchemaTypeVisibility(platformBuilder,
                             entry.getKey(), permissionGroup);
                 }
             }
@@ -163,4 +166,18 @@
         }
         return jetpackBuilder.build();
     }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private static class ApiHelperForT {
+        private ApiHelperForT() {
+            // This class is not instantiable.
+        }
+
+        @DoNotInline
+        static void addRequiredPermissionsForSchemaTypeVisibility(
+                android.app.appsearch.SetSchemaRequest.Builder platformBuilder,
+                String schemaType, Set<Integer> permissions) {
+            platformBuilder.addRequiredPermissionsForSchemaTypeVisibility(schemaType, permissions);
+        }
+    }
 }

diff --git a/appsearch/appsearch-play-services-storage/api/current.txt b/appsearch/appsearch-play-services-storage/api/current.txt
new file mode 100644
index 0000000..8d9c55f
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/api/current.txt

@@ -0,0 +1,27 @@
+// Signature format: 4.0
+package androidx.appsearch.playservicesstorage {
+
+  public final class PlayServicesStorage {
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.GlobalSearchSession!> createGlobalSearchSessionAsync(androidx.appsearch.playservicesstorage.PlayServicesStorage.GlobalSearchContext);
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchSession!> createSearchSessionAsync(androidx.appsearch.playservicesstorage.PlayServicesStorage.SearchContext);
+  }
+
+  public static final class PlayServicesStorage.GlobalSearchContext {
+  }
+
+  public static final class PlayServicesStorage.GlobalSearchContext.Builder {
+    ctor public PlayServicesStorage.GlobalSearchContext.Builder(android.content.Context);
+    method public androidx.appsearch.playservicesstorage.PlayServicesStorage.GlobalSearchContext build();
+  }
+
+  public static final class PlayServicesStorage.SearchContext {
+    method public String getDatabaseName();
+  }
+
+  public static final class PlayServicesStorage.SearchContext.Builder {
+    ctor public PlayServicesStorage.SearchContext.Builder(android.content.Context, String);
+    method public androidx.appsearch.playservicesstorage.PlayServicesStorage.SearchContext build();
+  }
+
+}
+

diff --git a/webkit/webkit/api/res-1.6.0-beta02.txt b/appsearch/appsearch-play-services-storage/api/res-current.txt
similarity index 100%
copy from webkit/webkit/api/res-1.6.0-beta02.txt
copy to appsearch/appsearch-play-services-storage/api/res-current.txt

diff --git a/appsearch/appsearch-play-services-storage/api/restricted_current.txt b/appsearch/appsearch-play-services-storage/api/restricted_current.txt
new file mode 100644
index 0000000..8d9c55f
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/api/restricted_current.txt

@@ -0,0 +1,27 @@
+// Signature format: 4.0
+package androidx.appsearch.playservicesstorage {
+
+  public final class PlayServicesStorage {
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.GlobalSearchSession!> createGlobalSearchSessionAsync(androidx.appsearch.playservicesstorage.PlayServicesStorage.GlobalSearchContext);
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchSession!> createSearchSessionAsync(androidx.appsearch.playservicesstorage.PlayServicesStorage.SearchContext);
+  }
+
+  public static final class PlayServicesStorage.GlobalSearchContext {
+  }
+
+  public static final class PlayServicesStorage.GlobalSearchContext.Builder {
+    ctor public PlayServicesStorage.GlobalSearchContext.Builder(android.content.Context);
+    method public androidx.appsearch.playservicesstorage.PlayServicesStorage.GlobalSearchContext build();
+  }
+
+  public static final class PlayServicesStorage.SearchContext {
+    method public String getDatabaseName();
+  }
+
+  public static final class PlayServicesStorage.SearchContext.Builder {
+    ctor public PlayServicesStorage.SearchContext.Builder(android.content.Context, String);
+    method public androidx.appsearch.playservicesstorage.PlayServicesStorage.SearchContext build();
+  }
+
+}
+

diff --git a/appsearch/appsearch-play-services-storage/build.gradle b/appsearch/appsearch-play-services-storage/build.gradle
new file mode 100644
index 0000000..042eb5d
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/build.gradle

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.Publish
+
+plugins {
+    id("AndroidXPlugin")
+    id("com.android.library")
+}
+
+dependencies {
+    implementation project(":appsearch:appsearch")
+    // TODO(b/278583111) Swap with the core library version in which Function gets added.
+    implementation project(":core:core")
+    implementation("androidx.concurrent:concurrent-futures:1.0.0")
+    implementation('androidx.collection:collection:1.2.0')
+    implementation("com.google.android.gms:play-services-appsearch:16.0.0", {
+        exclude group: "androidx.fragment", module: "fragment"
+        exclude group: "androidx.core", module: "core"
+    })
+
+    androidTestImplementation(libs.testCore)
+    androidTestImplementation(libs.testRules)
+    androidTestImplementation(libs.truth)
+    androidTestImplementation(libs.junit)
+}
+
+androidx {
+    name = "AppSearch Play Services Storage"
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    inceptionYear = "2023"
+    description =
+            "An implementation of AppSearchSession and GlobalSearchSession on pre-S devices using " +
+                    "play-services-appsearch SDK with Gogle Play Services as storage backend."
+}
+
+android {
+    namespace "androidx.appsearch.playservicesstorage"
+}

diff --git a/appsearch/appsearch-play-services-storage/src/androidTest/AndroidManifest.xml b/appsearch/appsearch-play-services-storage/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..0cd568b
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<!--
+  Copyright 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>
\ No newline at end of file

diff --git a/appsearch/appsearch-play-services-storage/src/androidTest/java/androidx/appsearch/playservicesstorage/PlayServicesStorageTest.java b/appsearch/appsearch-play-services-storage/src/androidTest/java/androidx/appsearch/playservicesstorage/PlayServicesStorageTest.java
new file mode 100644
index 0000000..0f4db6d
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/androidTest/java/androidx/appsearch/playservicesstorage/PlayServicesStorageTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.appsearch.playservicesstorage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Test;
+
+public class PlayServicesStorageTest {
+    @Test
+    public void testSearchContext_databaseName() {
+        PlayServicesStorage.SearchContext searchContext =
+                new PlayServicesStorage.SearchContext.Builder(
+                        ApplicationProvider.getApplicationContext(),
+                        /*databaseName=*/"dbName").build();
+
+        assertThat(searchContext.getDatabaseName()).isEqualTo("dbName");
+    }
+
+    @Test
+    public void testSearchContext_withInvalidDatabaseName() {
+        // Test special character can present in database name. When a special character is banned
+        // in database name, add checker in SearchContext.Builder and reflect it in java doc.
+
+        IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
+                () -> new PlayServicesStorage.SearchContext.Builder(
+                        ApplicationProvider.getApplicationContext(),
+                        "testDatabaseNameEndWith/").build());
+        assertThat(e).hasMessageThat().isEqualTo("Database name cannot contain '/'");
+        e = assertThrows(IllegalArgumentException.class,
+                () -> new PlayServicesStorage.SearchContext.Builder(
+                        ApplicationProvider.getApplicationContext(),
+                        "/testDatabaseNameStartWith").build());
+        assertThat(e).hasMessageThat().isEqualTo("Database name cannot contain '/'");
+    }
+}

diff --git a/appsearch/appsearch-play-services-storage/src/main/AndroidManifest.xml b/appsearch/appsearch-play-services-storage/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8a693a4
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<manifest />
\ No newline at end of file

diff --git a/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/FeaturesImpl.java b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/FeaturesImpl.java
new file mode 100644
index 0000000..2441e57d
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/FeaturesImpl.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.playservicesstorage;
+
+import androidx.annotation.NonNull;
+import androidx.appsearch.app.Features;
+
+/**
+ * An implementation of {@link Features}. Feature availability is dependent on Android API
+ * level and GMSCore AppSearch module.
+ */
+final class FeaturesImpl implements Features {
+    @Override
+    public boolean isFeatureSupported(@NonNull String feature) {
+        // TODO(b/274986359): Update based on features available in {@link Features} and those
+        //  supported by play-services-appsearch.
+        switch (feature) {
+            // Android T Features
+            case Features.ADD_PERMISSIONS_AND_GET_VISIBILITY:
+                // fall through
+            case Features.GLOBAL_SEARCH_SESSION_GET_SCHEMA:
+                // fall through
+            case Features.GLOBAL_SEARCH_SESSION_GET_BY_ID:
+                // fall through
+            case Features.SEARCH_RESULT_MATCH_INFO_SUBMATCH:
+                // fall through
+                return true; // AppSearch features in T, present in GMSCore AppSearch.
+
+            // RegisterObserver and UnregisterObserver are not yet supported by GMSCore AppSearch.
+            // TODO(b/208654892) : Update to reflect support once this feature is supported.
+            case Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK:
+            // Android U Features
+            case Features.SEARCH_SPEC_PROPERTY_WEIGHTS:
+                // TODO(b/203700301) : Update to reflect support in Android U+ once this feature is
+                //  synced over into service-appsearch.
+                // fall through
+            case Features.TOKENIZER_TYPE_RFC822:
+                // TODO(b/259294369) : Update to reflect support in Android U+ once this feature is
+                //  synced over into service-appsearch.
+                // fall through
+            case Features.NUMERIC_SEARCH:
+                // TODO(b/259744228) : Update to reflect support in Android U+ once this feature is
+                // synced over into service-appsearch.
+                // fall through
+            case SEARCH_SPEC_ADVANCED_RANKING_EXPRESSION:
+                // TODO(b/261474063) : Update to reflect support in Android U+ once advanced
+                //  ranking becomes available.
+                // fall through
+            case Features.JOIN_SPEC_AND_QUALIFIED_ID:
+                // TODO(b/256022027) : Update to reflect support in Android U+ once this feature is
+                //  synced over into service-appsearch.
+                // fall through
+            case Features.VERBATIM_SEARCH:
+                // TODO(b/204333391) : Update to reflect support in Android U+ once this feature is
+                //  synced over into service-appsearch.
+                // fall through
+            case Features.LIST_FILTER_QUERY_LANGUAGE:
+                // TODO(b/208654892) : Update to reflect support in Android U+ once this feature is
+                //  synced over into service-appsearch.
+                return false;
+            default:
+                return false; // AppSearch features in U+, absent in GMSCore AppSearch.
+        }
+    }
+}

diff --git a/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/GlobalSearchSessionImpl.java b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/GlobalSearchSessionImpl.java
new file mode 100644
index 0000000..dc693e8
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/GlobalSearchSessionImpl.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.playservicesstorage;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.AppSearchBatchResult;
+import androidx.appsearch.app.Features;
+import androidx.appsearch.app.GenericDocument;
+import androidx.appsearch.app.GetByDocumentIdRequest;
+import androidx.appsearch.app.GetSchemaResponse;
+import androidx.appsearch.app.GlobalSearchSession;
+import androidx.appsearch.app.ReportSystemUsageRequest;
+import androidx.appsearch.app.SearchResults;
+import androidx.appsearch.app.SearchSpec;
+import androidx.appsearch.exceptions.AppSearchException;
+import androidx.appsearch.observer.ObserverCallback;
+import androidx.appsearch.observer.ObserverSpec;
+import androidx.appsearch.playservicesstorage.converter.AppSearchResultToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.GenericDocumentToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.GetSchemaResponseToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.RequestToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.SearchSpecToGmsConverter;
+import androidx.appsearch.playservicesstorage.util.AppSearchTaskFutures;
+import androidx.core.util.Preconditions;
+
+import com.google.android.gms.appsearch.GlobalSearchClient;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.Executor;
+
+/**
+ * An implementation of {@link GlobalSearchSession} which proxies to a Google Play Service's
+ * {@link GlobalSearchClient}.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class GlobalSearchSessionImpl implements GlobalSearchSession {
+
+    private final GlobalSearchClient mGmsClient;
+    private final Features mFeatures;
+
+    GlobalSearchSessionImpl(
+            @NonNull GlobalSearchClient gmsClient,
+            @NonNull Features features) {
+        mGmsClient = Preconditions.checkNotNull(gmsClient);
+        mFeatures = Preconditions.checkNotNull(features);
+    }
+    @NonNull
+    @Override
+    public ListenableFuture<AppSearchBatchResult<String, GenericDocument>> getByDocumentIdAsync(
+            @NonNull String packageName, @NonNull String databaseName,
+            @NonNull GetByDocumentIdRequest request) {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getByDocumentId(packageName, databaseName,
+                        RequestToGmsConverter.toGmsGetByDocumentIdRequest(request)),
+                result -> AppSearchResultToGmsConverter.gmsAppSearchBatchResultToJetpack(
+                        result, GenericDocumentToGmsConverter::toJetpackGenericDocument));
+    }
+
+    @NonNull
+    @Override
+    public SearchResults search(@NonNull String queryExpression, @NonNull SearchSpec searchSpec) {
+        com.google.android.gms.appsearch.SearchResults searchResults =
+                mGmsClient.search(queryExpression,
+                        SearchSpecToGmsConverter.toGmsSearchSpec(searchSpec));
+        return new SearchResultsImpl(searchResults, searchSpec);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<Void> reportSystemUsageAsync(
+            @NonNull ReportSystemUsageRequest request) {
+        Task<Void> flushTask = Tasks.forResult(null);
+        return AppSearchTaskFutures.toListenableFuture(flushTask, /* valueMapper= */ i-> i);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<GetSchemaResponse> getSchemaAsync(@NonNull String packageName,
+            @NonNull String databaseName) {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getSchema(packageName, databaseName),
+                GetSchemaResponseToGmsConverter::toJetpackGetSchemaResponse);
+    }
+
+    @NonNull
+    @Override
+    public Features getFeatures() {
+        return mFeatures;
+    }
+
+    @Override
+    public void registerObserverCallback(@NonNull String targetPackageName,
+            @NonNull ObserverSpec spec, @NonNull Executor executor,
+            @NonNull ObserverCallback observer) throws AppSearchException {
+        // TODO(b/274986359): Implement registerObserverCallback for PlayServicesStorage.
+        throw new UnsupportedOperationException(
+                "registerObserverCallback is not yet supported on this AppSearch implementation.");
+    }
+
+    @Override
+    public void unregisterObserverCallback(@NonNull String targetPackageName,
+            @NonNull ObserverCallback observer) throws AppSearchException {
+        // TODO(b/274986359): Implement unregisterObserverCallback for PlayServicesStorage.
+        throw new UnsupportedOperationException(
+                "unregisterObserverCallback is not yet supported on this "
+                        + "AppSearch implementation.");
+    }
+
+    @Override
+    public void close() {
+        mGmsClient.close();
+    }
+}

diff --git a/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/PlayServicesStorage.java b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/PlayServicesStorage.java
new file mode 100644
index 0000000..eab92f9
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/PlayServicesStorage.java

@@ -0,0 +1,157 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.playservicesstorage;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.appsearch.app.AppSearchSession;
+import androidx.appsearch.app.GlobalSearchSession;
+import androidx.appsearch.playservicesstorage.util.AppSearchTaskFutures;
+import androidx.core.util.Preconditions;
+
+import com.google.android.gms.appsearch.AppSearch;
+import com.google.android.gms.appsearch.AppSearchClient;
+import com.google.android.gms.appsearch.GlobalSearchClient;
+import com.google.android.gms.tasks.Task;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * An AppSearch storage system which stores data in the central AppSearch service in Google
+ * Play Services.
+ */
+public final class PlayServicesStorage {
+
+    private PlayServicesStorage() {
+    }
+
+    /** Contains information about how to create the search session. */
+    public static final class SearchContext {
+        final Context mContext;
+        final String mDatabaseName;
+
+        SearchContext(@NonNull Context context, @NonNull String databaseName) {
+            mContext = Preconditions.checkNotNull(context);
+            mDatabaseName = Preconditions.checkNotNull(databaseName);
+        }
+
+        /**
+         * Returns the name of the database to create or open.
+         */
+        @NonNull
+        public String getDatabaseName() {
+            return mDatabaseName;
+        }
+
+        /** Builder for {@link SearchContext} objects. */
+        public static final class Builder {
+            private final Context mContext;
+            private final String mDatabaseName;
+
+            /**
+             * Creates a {@link SearchContext.Builder} instance.
+             *
+             * <p>{@link AppSearchSession} will create or open a database under the given name.
+             *
+             * <p>Databases with different names are fully separate with distinct schema types,
+             * namespaces, and documents.
+             *
+             * <p>The database name cannot contain {@code '/'}.
+             *
+             * <p>The database name will be visible to all system UI or third-party applications
+             * that have been granted access to any of the database's documents (for example,
+             * using {@link
+             * androidx.appsearch.app.SetSchemaRequest.Builder#setSchemaTypeVisibilityForPackage}).
+             *
+             * @param databaseName The name of the database.
+             * @throws IllegalArgumentException if the databaseName contains {@code '/'}.
+             */
+            public Builder(@NonNull Context context, @NonNull String databaseName) {
+                mContext = Preconditions.checkNotNull(context);
+                Preconditions.checkNotNull(databaseName);
+                if (databaseName.contains("/")) {
+                    throw new IllegalArgumentException("Database name cannot contain '/'");
+                }
+                mDatabaseName = databaseName;
+            }
+
+            /** Builds a {@link SearchContext} instance. */
+            @NonNull
+            public SearchContext build() {
+                return new SearchContext(mContext, mDatabaseName);
+            }
+        }
+    }
+
+    /** Contains information relevant to creating a global search session. */
+    public static final class GlobalSearchContext {
+        final Context mContext;
+
+        GlobalSearchContext(@NonNull Context context) {
+            mContext = Preconditions.checkNotNull(context);
+        }
+
+        /** Builder for {@link GlobalSearchContext} objects. */
+        public static final class Builder {
+            private final Context mContext;
+
+            public Builder(@NonNull Context context) {
+                mContext = Preconditions.checkNotNull(context);
+            }
+
+            /** Builds a {@link GlobalSearchContext} instance. */
+            @NonNull
+            public GlobalSearchContext build() {
+                return new GlobalSearchContext(mContext);
+            }
+        }
+    }
+
+    /**
+     * Opens a new {@link AppSearchSession} on this storage.
+     *
+     * @param context The {@link SearchContext} contains all information to create a new
+     *                {@link AppSearchSession}
+     */
+    @NonNull
+    public static ListenableFuture<AppSearchSession> createSearchSessionAsync(
+            @NonNull SearchContext context) {
+        Preconditions.checkNotNull(context);
+        Task<AppSearchClient> appSearchClientTask = AppSearch
+                .createAppSearchClient(context.mContext);
+        return AppSearchTaskFutures.toListenableFuture(
+                appSearchClientTask,
+                task -> new SearchSessionImpl(task, new FeaturesImpl(), context.mDatabaseName));
+    }
+
+    /**
+     * Opens a new {@link GlobalSearchSession} on this storage.
+     *
+     * @param context The {@link GlobalSearchContext} contains all information to create a new
+     *                {@link GlobalSearchSession}
+     */
+    @NonNull
+    public static ListenableFuture<GlobalSearchSession> createGlobalSearchSessionAsync(
+            @NonNull GlobalSearchContext context) {
+        Preconditions.checkNotNull(context);
+        Task<GlobalSearchClient> globalSearchClientTask = AppSearch
+                .createGlobalSearchClient(context.mContext);
+        return AppSearchTaskFutures.toListenableFuture(
+                globalSearchClientTask,
+                task -> new GlobalSearchSessionImpl(task, new FeaturesImpl()));
+    }
+}

diff --git a/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchResultsImpl.java b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchResultsImpl.java
new file mode 100644
index 0000000..ba23844
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchResultsImpl.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.playservicesstorage;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.SearchResult;
+import androidx.appsearch.app.SearchResults;
+import androidx.appsearch.app.SearchSpec;
+import androidx.appsearch.playservicesstorage.converter.SearchResultToGmsConverter;
+import androidx.appsearch.playservicesstorage.util.AppSearchTaskFutures;
+import androidx.core.util.Preconditions;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.List;
+
+/**
+ * GooglePlayService's implementation of {@link SearchResults} which proxies to the
+ * GooglePlayService's {@link com.google.android.gms.appsearch.SearchResults}.
+
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class SearchResultsImpl implements SearchResults {
+    private final com.google.android.gms.appsearch.SearchResults mGmsResults;
+
+    SearchResultsImpl(
+            @NonNull com.google.android.gms.appsearch.SearchResults gmsResults,
+            @NonNull SearchSpec searchSpec) {
+        mGmsResults = Preconditions.checkNotNull(gmsResults);
+    }
+
+    @Override
+    @NonNull
+    public ListenableFuture<List<SearchResult>> getNextPageAsync() {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsResults.getNextPage(),
+                SearchResultToGmsConverter::toJetpackSearchResultList
+        );
+    }
+
+    @Override
+    public void close() {
+        mGmsResults.close();
+    }
+}

diff --git a/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchSessionImpl.java b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchSessionImpl.java
new file mode 100644
index 0000000..e34c08c
--- /dev/null
+++ b/appsearch/appsearch-play-services-storage/src/main/java/androidx/appsearch/playservicesstorage/SearchSessionImpl.java

@@ -0,0 +1,216 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.playservicesstorage;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.AppSearchBatchResult;
+import androidx.appsearch.app.AppSearchSession;
+import androidx.appsearch.app.Features;
+import androidx.appsearch.app.GenericDocument;
+import androidx.appsearch.app.GetByDocumentIdRequest;
+import androidx.appsearch.app.GetSchemaResponse;
+import androidx.appsearch.app.PutDocumentsRequest;
+import androidx.appsearch.app.RemoveByDocumentIdRequest;
+import androidx.appsearch.app.ReportUsageRequest;
+import androidx.appsearch.app.SearchResults;
+import androidx.appsearch.app.SearchSpec;
+import androidx.appsearch.app.SearchSuggestionResult;
+import androidx.appsearch.app.SearchSuggestionSpec;
+import androidx.appsearch.app.SetSchemaRequest;
+import androidx.appsearch.app.SetSchemaResponse;
+import androidx.appsearch.app.StorageInfo;
+import androidx.appsearch.playservicesstorage.converter.AppSearchResultToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.GenericDocumentToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.GetSchemaResponseToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.RequestToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.ResponseToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.SearchSpecToGmsConverter;
+import androidx.appsearch.playservicesstorage.converter.SetSchemaRequestToGmsConverter;
+import androidx.appsearch.playservicesstorage.util.AppSearchTaskFutures;
+import androidx.core.util.Preconditions;
+
+import com.google.android.gms.appsearch.AppSearchClient;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.Closeable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * An implementation of {@link AppSearchSession} which proxies to a Google Play Service's
+ * {@link AppSearchClient}.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class SearchSessionImpl implements AppSearchSession, Closeable {
+    private final AppSearchClient mGmsClient;
+    private final Features mFeatures;
+    private final String mDatabaseName;
+
+
+    SearchSessionImpl(
+            @NonNull AppSearchClient gmsClient,
+            @NonNull Features features,
+            @NonNull String databaseName) {
+        mGmsClient = Preconditions.checkNotNull(gmsClient);
+        mFeatures = Preconditions.checkNotNull(features);
+        mDatabaseName = Preconditions.checkNotNull(databaseName);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<SetSchemaResponse> setSchemaAsync(@NonNull SetSchemaRequest request) {
+        Preconditions.checkNotNull(request);
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.setSchema(
+                        SetSchemaRequestToGmsConverter.toGmsSetSchemaRequest(
+                                request),
+                        mDatabaseName),
+                SetSchemaRequestToGmsConverter::toJetpackSetSchemaResponse);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<GetSchemaResponse> getSchemaAsync() {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getSchema(mDatabaseName),
+                GetSchemaResponseToGmsConverter::toJetpackGetSchemaResponse);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<Set<String>> getNamespacesAsync() {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getNamespaces(mDatabaseName),
+                /* valueMapper= */ i -> i);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<AppSearchBatchResult<String, Void>> putAsync(
+            @NonNull PutDocumentsRequest request) {
+        Preconditions.checkNotNull(request);
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.put(
+                        RequestToGmsConverter.toGmsPutDocumentsRequest(request),
+                        mDatabaseName),
+                result -> AppSearchResultToGmsConverter.gmsAppSearchBatchResultToJetpack(
+                        result, /* valueMapper= */ i -> i));
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<AppSearchBatchResult<String, GenericDocument>> getByDocumentIdAsync(
+            @NonNull GetByDocumentIdRequest request) {
+        Preconditions.checkNotNull(request);
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getByDocumentId(
+                        RequestToGmsConverter.toGmsGetByDocumentIdRequest(request),
+                        mDatabaseName),
+                result -> AppSearchResultToGmsConverter.gmsAppSearchBatchResultToJetpack(
+                                result, GenericDocumentToGmsConverter::toJetpackGenericDocument));
+    }
+
+    @NonNull
+    @Override
+    public SearchResults search(@NonNull String queryExpression, @NonNull SearchSpec searchSpec) {
+        Preconditions.checkNotNull(queryExpression);
+        Preconditions.checkNotNull(searchSpec);
+        com.google.android.gms.appsearch.SearchResults gmsSearchResults =
+                mGmsClient.search(
+                        queryExpression,
+                        SearchSpecToGmsConverter.toGmsSearchSpec(searchSpec),
+                        mDatabaseName);
+        return new SearchResultsImpl(gmsSearchResults, searchSpec);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<List<SearchSuggestionResult>> searchSuggestionAsync(
+            @NonNull String suggestionQueryExpression,
+            @NonNull SearchSuggestionSpec searchSuggestionSpec) {
+        // TODO(b/274986359): Implement searchSuggestionAsync for PlayServicesStorage.
+        throw new UnsupportedOperationException(
+                "Search Suggestion is not yet supported on this AppSearch implementation.");
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<Void> reportUsageAsync(@NonNull ReportUsageRequest request) {
+        Preconditions.checkNotNull(request);
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.reportUsage(
+                        RequestToGmsConverter.toGmsReportUsageRequest(request),
+                        mDatabaseName),
+                /* valueMapper= */ i -> i);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<AppSearchBatchResult<String, Void>> removeAsync(
+            @NonNull RemoveByDocumentIdRequest request) {
+        Preconditions.checkNotNull(request);
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.remove(
+                        RequestToGmsConverter
+                                .toGmsRemoveByDocumentIdRequest(request),
+                        mDatabaseName),
+                result -> AppSearchResultToGmsConverter.gmsAppSearchBatchResultToJetpack(
+                        result, /* valueMapper= */ i -> i));
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<Void> removeAsync(@NonNull String queryExpression,
+            @NonNull SearchSpec searchSpec) {
+        Preconditions.checkNotNull(queryExpression);
+        Preconditions.checkNotNull(searchSpec);
+        return AppSearchTaskFutures.toListenableFuture(mGmsClient.remove(
+                        queryExpression,
+                        SearchSpecToGmsConverter.toGmsSearchSpec(searchSpec),
+                        mDatabaseName),
+                /* valueMapper= */ i -> i);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<StorageInfo> getStorageInfoAsync() {
+        return AppSearchTaskFutures.toListenableFuture(
+                mGmsClient.getStorageInfo(mDatabaseName),
+                ResponseToGmsConverter::toJetpackStorageInfo);
+    }
+
+    @NonNull
+    @Override
+    public ListenableFuture<Void> requestFlushAsync() {
+        Task<Void> flushTask = Tasks.forResult(null);
+        return AppSearchTaskFutures.toListenableFuture(flushTask, /* valueMapper= */ i-> i);
+    }
+
+    @NonNull
+    @Override
+    public Features getFeatures() {
+        return mFeatures;
+    }
+
+    @Override
+    public void close() {
+        mGmsClient.close();
+    }
+}