Merge commit '0ccdd90e6916f52dbf9d69b0afa7ecea398ad130' into manual_merge_0ccdd90e6916f52dbf9d69b0afa7ecea398ad130

Bug: 193833051
Test: ./gradlew bOS
Change-Id: Idb2e82d38d8ef236c1ce8ba165ce598371309c20

diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index 7a93bc3..f904448 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml

@@ -6160,7 +6160,7 @@
         errorLine2="                               ~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatImageButton.java"
-            line="103"
+            line="112"
             column="32"/>
     </issue>
 
@@ -6171,7 +6171,7 @@
         errorLine2="                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatImageHelper.java"
-            line="51"
+            line="52"
             column="36"/>
     </issue>
 
@@ -6182,7 +6182,7 @@
         errorLine2="                               ~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatImageView.java"
-            line="113"
+            line="123"
             column="32"/>
     </issue>
 

diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java
index b532d36..01565c0e 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java

@@ -469,8 +469,10 @@
             // after the inserted content (if no space was already present). See
             // https://cs.android.com/android/platform/superproject/+/android-4.4.4_r2:frameworks/base/core/java/android/widget/TextView.java;l=8526,8527,8528,8545,8546
             assertTextAndCursorPosition("ab xz", 2);
-        } else {
+        } else if (Build.VERSION.SDK_INT <= 30) {
             assertTextAndCursorPosition("abxz", 2);
+        } else {
+            assertTextAndCursorPosition("a\nbxz", 3);
         }
     }
 
@@ -610,6 +612,13 @@
             mExtraValue = extraValue;
         }
 
+        @NonNull
+        @Override
+        public String toString() {
+            return "[" + "clip=" + mClip + ", source=" + mSource + ", flags=" + mFlags
+                    + ", linkUri=" + mLinkUri + ", extraValue=" + mExtraValue + "]";
+        }
+
         @Override
         public boolean matches(ContentInfoCompat actual) {
             ClipData.Item expectedItem = mClip.getItemAt(0);
@@ -623,11 +632,22 @@
         }
 
         private boolean extrasMatch(Bundle actualExtras) {
-            if (mSource == SOURCE_INPUT_METHOD && Build.VERSION.SDK_INT >= 25) {
-                assertThat(actualExtras).isNotNull();
+            if (mSource == SOURCE_INPUT_METHOD && Build.VERSION.SDK_INT >= 25
+                    && Build.VERSION.SDK_INT <= 30) {
+                // On SDK >= 25 and <= 30, when inserting from the keyboard, the InputContentInfo
+                // object passed from the IME should be set in the extras. This is needed in order
+                // to prevent premature release of URI permissions. Passing this object via the
+                // extras is not needed on other SDKs: on  SDK < 25, the IME code handles URI
+                // permissions differently (expects the IME to grant URI permissions), and on
+                // SDK > 30, this is handled by the platform implementation of the API.
+                if (actualExtras == null) {
+                    return false;
+                }
                 Parcelable actualInputContentInfoExtra = actualExtras.getParcelable(
                         "androidx.core.view.extra.INPUT_CONTENT_INFO");
-                assertThat(actualInputContentInfoExtra).isInstanceOf(InputContentInfo.class);
+                if (!(actualInputContentInfoExtra instanceof InputContentInfo)) {
+                    return false;
+                }
             } else if (mExtraValue == null) {
                 return actualExtras == null;
             }

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatEditText.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatEditText.java
index 7a954d5..708c5ee 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatEditText.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatEditText.java

@@ -230,10 +230,15 @@
         mTextHelper.populateSurroundingTextIfNeeded(this, ic, outAttrs);
         ic = AppCompatHintHelper.onCreateInputConnection(ic, outAttrs, this);
 
-        String[] mimeTypes = ViewCompat.getOnReceiveContentMimeTypes(this);
-        if (ic != null && mimeTypes != null) {
-            EditorInfoCompat.setContentMimeTypes(outAttrs, mimeTypes);
-            ic = InputConnectionCompat.createWrapper(this, ic, outAttrs);
+        // On SDK 30 and below, we manually configure the InputConnection here to use
+        // ViewCompat.performReceiveContent. On S and above, the platform's BaseInputConnection
+        // implementation calls View.performReceiveContent by default.
+        if (ic != null && Build.VERSION.SDK_INT <= 30) {
+            String[] mimeTypes = ViewCompat.getOnReceiveContentMimeTypes(this);
+            if (mimeTypes != null) {
+                EditorInfoCompat.setContentMimeTypes(outAttrs, mimeTypes);
+                ic = InputConnectionCompat.createWrapper(this, ic, outAttrs);
+            }
         }
         return mAppCompatEmojiEditTextHelper.onCreateInputConnection(ic, outAttrs);
     }

diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatReceiveContentHelper.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatReceiveContentHelper.java
index cc84b4b..62d2a49 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatReceiveContentHelper.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/AppCompatReceiveContentHelper.java

@@ -33,6 +33,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -48,15 +49,16 @@
     private static final String LOG_TAG = "ReceiveContent";
 
     /**
-     * If the menu action is either "Paste" or "Paste as plain text" and the view has a
-     * {@link androidx.core.view.OnReceiveContentListener}, use the listener to handle the paste.
+     * If the SDK is <= 30 and the view has a {@link androidx.core.view.OnReceiveContentListener},
+     * use the listener to handle the "Paste" and "Paste as plain text" actions.
      *
      * @return true if the action was handled; false otherwise
      */
     static boolean maybeHandleMenuActionViaPerformReceiveContent(@NonNull TextView view,
-            int menuItemId) {
-        if (!(menuItemId == android.R.id.paste || menuItemId == android.R.id.pasteAsPlainText)
-                || ViewCompat.getOnReceiveContentMimeTypes(view) == null) {
+            int actionId) {
+        if (Build.VERSION.SDK_INT >= 31
+                || ViewCompat.getOnReceiveContentMimeTypes(view) == null
+                || !(actionId == android.R.id.paste || actionId == android.R.id.pasteAsPlainText)) {
             return false;
         }
         ClipboardManager cm = (ClipboardManager) view.getContext().getSystemService(
@@ -64,7 +66,7 @@
         ClipData clip = (cm == null) ? null : cm.getPrimaryClip();
         if (clip != null && clip.getItemCount() > 0) {
             ContentInfoCompat payload = new ContentInfoCompat.Builder(clip, SOURCE_CLIPBOARD)
-                    .setFlags((menuItemId == android.R.id.paste) ? 0 : FLAG_CONVERT_TO_PLAIN_TEXT)
+                    .setFlags((actionId == android.R.id.paste) ? 0 : FLAG_CONVERT_TO_PLAIN_TEXT)
                     .build();
             ViewCompat.performReceiveContent(view, payload);
         }
@@ -72,14 +74,16 @@
     }
 
     /**
-     * If the given view has a {@link androidx.core.view.OnReceiveContentListener}, try to handle
-     * drag-and-drop via the listener.
+     * If the SDK is <= 30 (but >= 24) and the view has a
+     * {@link androidx.core.view.OnReceiveContentListener}, try to handle drag-and-drop via the
+     * listener.
      *
      * @return true if the event was handled; false otherwise
      */
     static boolean maybeHandleDragEventViaPerformReceiveContent(@NonNull View view,
             @NonNull DragEvent event) {
-        if (Build.VERSION.SDK_INT < 24
+        if (Build.VERSION.SDK_INT >= 31
+                || Build.VERSION.SDK_INT < 24
                 || event.getLocalState() != null
                 || ViewCompat.getOnReceiveContentMimeTypes(view) == null) {
             return false;
@@ -113,6 +117,7 @@
     private static final class OnDropApi24Impl {
         private OnDropApi24Impl() {}
 
+        @DoNotInline
         static boolean onDropForTextView(@NonNull DragEvent event, @NonNull TextView view,
                 @NonNull Activity activity) {
             activity.requestDragAndDropPermissions(event);
@@ -129,6 +134,7 @@
             return true;
         }
 
+        @DoNotInline
         static boolean onDropForView(@NonNull DragEvent event, @NonNull View view,
                 @NonNull Activity activity) {
             activity.requestDragAndDropPermissions(event);

diff --git a/work/workmanager-gcm/api/2.6.0-beta01.txt b/appsearch/appsearch-ktx/api/current.txt
similarity index 100%
copy from work/workmanager-gcm/api/2.6.0-beta01.txt
copy to appsearch/appsearch-ktx/api/current.txt

diff --git a/work/workmanager-gcm/api/2.6.0-beta01.txt b/appsearch/appsearch-ktx/api/public_plus_experimental_current.txt
similarity index 100%
copy from work/workmanager-gcm/api/2.6.0-beta01.txt
copy to appsearch/appsearch-ktx/api/public_plus_experimental_current.txt

diff --git a/work/workmanager-ktx/api/res-2.6.0-beta01.txt b/appsearch/appsearch-ktx/api/res-current.txt
similarity index 100%
rename from work/workmanager-ktx/api/res-2.6.0-beta01.txt
rename to appsearch/appsearch-ktx/api/res-current.txt

diff --git a/work/workmanager-gcm/api/2.6.0-beta01.txt b/appsearch/appsearch-ktx/api/restricted_current.txt
similarity index 100%
copy from work/workmanager-gcm/api/2.6.0-beta01.txt
copy to appsearch/appsearch-ktx/api/restricted_current.txt

diff --git a/appsearch/appsearch-ktx/build.gradle b/appsearch/appsearch-ktx/build.gradle
new file mode 100644
index 0000000..9675672
--- /dev/null
+++ b/appsearch/appsearch-ktx/build.gradle

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 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.
+ */
+
+import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
+import androidx.build.Publish
+
+plugins {
+    id('AndroidXPlugin')
+    id('com.android.library')
+    id('org.jetbrains.kotlin.android')
+    id('org.jetbrains.kotlin.kapt')
+}
+
+dependencies {
+    api(libs.kotlinStdlib)
+
+    kaptAndroidTest project(':appsearch:appsearch-compiler')
+    androidTestImplementation project(':appsearch:appsearch')
+    androidTestImplementation project(':appsearch:appsearch-local-storage')
+    androidTestImplementation(libs.testCore)
+    androidTestImplementation(libs.testRules)
+    androidTestImplementation(libs.truth)
+}
+
+androidx {
+    name = 'AndroidX AppSearch - Kotlin Extensions'
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenGroup = LibraryGroups.APPSEARCH
+    mavenVersion = LibraryVersions.APPSEARCH
+    inceptionYear = '2021'
+    description = 'AndroidX AppSearch - Kotlin Extensions'
+}

diff --git a/appsearch/appsearch-ktx/src/androidTest/java/AnnotationProcessorKtTest.kt b/appsearch/appsearch-ktx/src/androidTest/java/AnnotationProcessorKtTest.kt
new file mode 100644
index 0000000..e5163dd
--- /dev/null
+++ b/appsearch/appsearch-ktx/src/androidTest/java/AnnotationProcessorKtTest.kt

@@ -0,0 +1,340 @@
+/*
+ * 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.ktx
+
+import android.content.Context
+import androidx.appsearch.annotation.Document
+import androidx.appsearch.app.AppSearchSchema
+import androidx.appsearch.app.AppSearchSession
+import androidx.appsearch.app.GenericDocument
+import androidx.appsearch.app.PutDocumentsRequest
+import androidx.appsearch.app.SearchResult
+import androidx.appsearch.app.SearchResults
+import androidx.appsearch.app.SearchSpec
+import androidx.appsearch.app.SetSchemaRequest
+import androidx.appsearch.localstorage.LocalStorage
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+public class AnnotationProcessorKtTest {
+    private companion object {
+        private const val DB_NAME = ""
+    }
+
+    private lateinit var session: AppSearchSession
+
+    @Before
+    public fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        session = LocalStorage.createSearchSession(
+            LocalStorage.SearchContext.Builder(context, DB_NAME).build()
+        ).get()
+
+        // Cleanup whatever documents may still exist in these databases. This is needed in
+        // addition to tearDown in case a test exited without completing properly.
+        cleanup()
+    }
+
+    @After
+    public fun tearDown() {
+        // Cleanup whatever documents may still exist in these databases.
+        cleanup()
+    }
+
+    private fun cleanup() {
+        session.setSchema(SetSchemaRequest.Builder().setForceOverride(true).build()).get()
+    }
+
+    @Document
+    internal data class Card(
+        @Document.Namespace
+        val namespace: String,
+
+        @Document.Id
+        val id: String,
+
+        @Document.CreationTimestampMillis
+        val creationTimestampMillis: Long = 0L,
+
+        @Document.StringProperty(
+            indexingType = AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES,
+            tokenizerType = AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN
+        )
+        val string: String? = null,
+    )
+
+    @Document
+    internal data class Gift(
+        @Document.Namespace
+        val namespace: String,
+
+        @Document.Id
+        val id: String,
+
+        @Document.CreationTimestampMillis
+        val creationTimestampMillis: Long = 0L,
+
+        // Collections
+        @Document.LongProperty
+        val collectLong: Collection<Long>,
+
+        @Document.LongProperty
+        val collectInteger: Collection<Int>,
+
+        @Document.DoubleProperty
+        val collectDouble: Collection<Double>,
+
+        @Document.DoubleProperty
+        val collectFloat: Collection<Float>,
+
+        @Document.BooleanProperty
+        val collectBoolean: Collection<Boolean>,
+
+        @Document.BytesProperty
+        val collectByteArr: Collection<ByteArray>,
+
+        @Document.StringProperty
+        val collectString: Collection<String>,
+
+        @Document.DocumentProperty
+        val collectCard: Collection<Card>,
+
+        // Arrays
+        @Document.LongProperty
+        val arrBoxLong: Array<Long>,
+
+        @Document.LongProperty
+        val arrUnboxLong: LongArray,
+
+        @Document.LongProperty
+        val arrBoxInteger: Array<Int>,
+
+        @Document.LongProperty
+        val arrUnboxInt: IntArray,
+
+        @Document.DoubleProperty
+        val arrBoxDouble: Array<Double>,
+
+        @Document.DoubleProperty
+        val arrUnboxDouble: DoubleArray,
+
+        @Document.DoubleProperty
+        val arrBoxFloat: Array<Float>,
+
+        @Document.DoubleProperty
+        val arrUnboxFloat: FloatArray,
+
+        @Document.BooleanProperty
+        val arrBoxBoolean: Array<Boolean>,
+
+        @Document.BooleanProperty
+        val arrUnboxBoolean: BooleanArray,
+
+        @Document.BytesProperty
+        val arrUnboxByteArr: Array<ByteArray>,
+
+        @Document.BytesProperty
+        val boxByteArr: Array<Byte>,
+
+        @Document.StringProperty
+        val arrString: Array<String>,
+
+        @Document.DocumentProperty
+        val arrCard: Array<Card>,
+
+        // Single values
+        @Document.StringProperty
+        val string: String,
+
+        @Document.LongProperty
+        val boxLong: Long,
+
+        @Document.LongProperty
+        val unboxLong: Long = 0,
+
+        @Document.LongProperty
+        val boxInteger: Int,
+
+        @Document.LongProperty
+        val unboxInt: Int = 0,
+
+        @Document.DoubleProperty
+        val boxDouble: Double,
+
+        @Document.DoubleProperty
+        val unboxDouble: Double = 0.0,
+
+        @Document.DoubleProperty
+        val boxFloat: Float,
+
+        @Document.DoubleProperty
+        val unboxFloat: Float = 0f,
+
+        @Document.BooleanProperty
+        val boxBoolean: Boolean,
+
+        @Document.BooleanProperty
+        val unboxBoolean: Boolean = false,
+
+        @Document.BytesProperty
+        val unboxByteArr: ByteArray,
+
+        @Document.DocumentProperty
+        val card: Card
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Gift
+
+            if (namespace != other.namespace) return false
+            if (id != other.id) return false
+            if (collectLong != other.collectLong) return false
+            if (collectInteger != other.collectInteger) return false
+            if (collectDouble != other.collectDouble) return false
+            if (collectFloat != other.collectFloat) return false
+            if (collectBoolean != other.collectBoolean) return false
+            // It's complicated to do a deep comparison of this, so we skip it
+            // if (collectByteArr != other.collectByteArr) return false
+            if (collectString != other.collectString) return false
+            if (collectCard != other.collectCard) return false
+            if (!arrBoxLong.contentEquals(other.arrBoxLong)) return false
+            if (!arrUnboxLong.contentEquals(other.arrUnboxLong)) return false
+            if (!arrBoxInteger.contentEquals(other.arrBoxInteger)) return false
+            if (!arrUnboxInt.contentEquals(other.arrUnboxInt)) return false
+            if (!arrBoxDouble.contentEquals(other.arrBoxDouble)) return false
+            if (!arrUnboxDouble.contentEquals(other.arrUnboxDouble)) return false
+            if (!arrBoxFloat.contentEquals(other.arrBoxFloat)) return false
+            if (!arrUnboxFloat.contentEquals(other.arrUnboxFloat)) return false
+            if (!arrBoxBoolean.contentEquals(other.arrBoxBoolean)) return false
+            if (!arrUnboxBoolean.contentEquals(other.arrUnboxBoolean)) return false
+            if (!arrUnboxByteArr.contentDeepEquals(other.arrUnboxByteArr)) return false
+            if (!boxByteArr.contentEquals(other.boxByteArr)) return false
+            if (!arrString.contentEquals(other.arrString)) return false
+            if (!arrCard.contentEquals(other.arrCard)) return false
+            if (string != other.string) return false
+            if (boxLong != other.boxLong) return false
+            if (unboxLong != other.unboxLong) return false
+            if (boxInteger != other.boxInteger) return false
+            if (unboxInt != other.unboxInt) return false
+            if (boxDouble != other.boxDouble) return false
+            if (unboxDouble != other.unboxDouble) return false
+            if (boxFloat != other.boxFloat) return false
+            if (unboxFloat != other.unboxFloat) return false
+            if (boxBoolean != other.boxBoolean) return false
+            if (unboxBoolean != other.unboxBoolean) return false
+            if (!unboxByteArr.contentEquals(other.unboxByteArr)) return false
+            if (card != other.card) return false
+
+            return true
+        }
+    }
+
+    @Test
+    public fun testAnnotationProcessor() {
+        session.setSchema(
+            SetSchemaRequest.Builder()
+                .addDocumentClasses(Card::class.java, Gift::class.java).build()
+        ).get()
+
+        // Create a Gift object and assign values.
+        val inputDocument = createPopulatedGift()
+
+        // Index the Gift document and query it.
+        session.put(PutDocumentsRequest.Builder().addDocuments(inputDocument).build())
+            .get().checkSuccess()
+        val searchResults = session.search("", SearchSpec.Builder().build())
+        val documents = convertSearchResultsToDocuments(searchResults)
+        assertThat(documents).hasSize(1)
+
+        // Convert GenericDocument to Gift and check values.
+        val outputDocument = documents[0].toDocumentClass(Gift::class.java)
+        assertThat(outputDocument).isEqualTo(inputDocument)
+    }
+
+    @Test
+    public fun testGenericDocumentConversion() {
+        val inGift = createPopulatedGift()
+        val genericDocument1 = GenericDocument.fromDocumentClass(inGift)
+        val genericDocument2 = GenericDocument.fromDocumentClass(inGift)
+        val outGift = genericDocument2.toDocumentClass(Gift::class.java)
+        assertThat(inGift).isNotSameInstanceAs(outGift)
+        assertThat(inGift).isEqualTo(outGift)
+        assertThat(genericDocument1).isNotSameInstanceAs(genericDocument2)
+        assertThat(genericDocument1).isEqualTo(genericDocument2)
+    }
+
+    private fun createPopulatedGift(): Gift {
+        val card1 = Card("card.namespace", "card.id1")
+        val card2 = Card("card.namespace", "card.id2")
+        return Gift(
+            namespace = "gift.namespace",
+            id = "gift.id",
+            arrBoxBoolean = arrayOf(true, false),
+            arrBoxDouble = arrayOf(0.0, 1.0),
+            arrBoxFloat = arrayOf(2.0f, 3.0f),
+            arrBoxInteger = arrayOf(4, 5),
+            arrBoxLong = arrayOf(6L, 7L),
+            arrString = arrayOf("cat", "dog"),
+            boxByteArr = arrayOf(8, 9),
+            arrUnboxBoolean = booleanArrayOf(false, true),
+            arrUnboxByteArr = arrayOf(byteArrayOf(0, 1), byteArrayOf(2, 3)),
+            arrUnboxDouble = doubleArrayOf(1.0, 0.0),
+            arrUnboxFloat = floatArrayOf(3.0f, 2.0f),
+            arrUnboxInt = intArrayOf(5, 4),
+            arrUnboxLong = longArrayOf(7, 6),
+            arrCard = arrayOf(card2, card2),
+            collectLong = listOf(6L, 7L),
+            collectInteger = listOf(4, 5),
+            collectBoolean = listOf(false, true),
+            collectString = listOf("cat", "dog"),
+            collectDouble = listOf(0.0, 1.0),
+            collectFloat = listOf(2.0f, 3.0f),
+            collectByteArr = listOf(byteArrayOf(0, 1), byteArrayOf(2, 3)),
+            collectCard = listOf(card2, card2),
+            string = "String",
+            boxLong = 1L,
+            unboxLong = 2L,
+            boxInteger = 3,
+            unboxInt = 4,
+            boxDouble = 5.0,
+            unboxDouble = 6.0,
+            boxFloat = 7.0f,
+            unboxFloat = 8.0f,
+            boxBoolean = true,
+            unboxBoolean = false,
+            unboxByteArr = byteArrayOf(1, 2, 3),
+            card = card1
+        )
+    }
+
+    private fun convertSearchResultsToDocuments(
+        searchResults: SearchResults
+    ): List<GenericDocument> {
+        var page = searchResults.nextPage.get()
+        val results = mutableListOf<SearchResult>()
+        while (page.isNotEmpty()) {
+            results.addAll(page)
+            page = searchResults.nextPage.get()
+        }
+        return results.map { it.genericDocument }
+    }
+}

diff --git a/appsearch/appsearch-ktx/src/main/AndroidManifest.xml b/appsearch/appsearch-ktx/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..1c35209
--- /dev/null
+++ b/appsearch/appsearch-ktx/src/main/AndroidManifest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<manifest package="androidx.appsearch.ktx"/>

diff --git a/appsearch/appsearch/api/current.txt b/appsearch/appsearch/api/current.txt
index de75467..b5282d0 100644
--- a/appsearch/appsearch/api/current.txt
+++ b/appsearch/appsearch/api/current.txt

@@ -1,30 +1,56 @@
 // Signature format: 4.0
 package androidx.appsearch.annotation {
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface AppSearchDocument {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Document {
     method public abstract String name() default "";
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.CreationTimestampMillis {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Namespace {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Property {
-    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_NONE;
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BooleanProperty {
     method public abstract String name() default "";
     method public abstract boolean required() default false;
-    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Score {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BytesProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.TtlMillis {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.CreationTimestampMillis {
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Uri {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DocumentProperty {
+    method public abstract boolean indexNestedProperties() default false;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DoubleProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Id {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.LongProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Namespace {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Score {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.StringProperty {
+    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.TtlMillis {
   }
 
 }
@@ -32,16 +58,27 @@
 package androidx.appsearch.app {
 
   public final class AppSearchBatchResult<KeyType, ValueType> {
+    method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getAll();
     method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getFailures();
     method public java.util.Map<KeyType!,ValueType!> getSuccesses();
     method public boolean isSuccess();
   }
 
+  public static final class AppSearchBatchResult.Builder<KeyType, ValueType> {
+    ctor public AppSearchBatchResult.Builder();
+    method public androidx.appsearch.app.AppSearchBatchResult<KeyType!,ValueType!> build();
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setFailure(KeyType, int, String?);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setResult(KeyType, androidx.appsearch.app.AppSearchResult<ValueType!>);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setSuccess(KeyType, ValueType?);
+  }
+
   public final class AppSearchResult<ValueType> {
     method public String? getErrorMessage();
     method public int getResultCode();
     method public ValueType? getResultValue();
     method public boolean isSuccess();
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newFailedResult(int, String?);
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newSuccessfulResult(ValueType?);
     field public static final int RESULT_INTERNAL_ERROR = 2; // 0x2
     field public static final int RESULT_INVALID_ARGUMENT = 3; // 0x3
     field public static final int RESULT_INVALID_SCHEMA = 7; // 0x7
@@ -49,6 +86,7 @@
     field public static final int RESULT_NOT_FOUND = 6; // 0x6
     field public static final int RESULT_OK = 0; // 0x0
     field public static final int RESULT_OUT_OF_SPACE = 5; // 0x5
+    field public static final int RESULT_SECURITY_ERROR = 8; // 0x8
     field public static final int RESULT_UNKNOWN_ERROR = 1; // 0x1
   }
 
@@ -57,28 +95,71 @@
     method public String getSchemaType();
   }
 
+  public static final class AppSearchSchema.BooleanPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BooleanPropertyConfig.Builder {
+    ctor public AppSearchSchema.BooleanPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig.Builder setCardinality(int);
+  }
+
   public static final class AppSearchSchema.Builder {
     ctor public AppSearchSchema.Builder(String);
     method public androidx.appsearch.app.AppSearchSchema.Builder addProperty(androidx.appsearch.app.AppSearchSchema.PropertyConfig);
     method public androidx.appsearch.app.AppSearchSchema build();
   }
 
-  public static final class AppSearchSchema.PropertyConfig {
+  public static final class AppSearchSchema.BytesPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BytesPropertyConfig.Builder {
+    ctor public AppSearchSchema.BytesPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public String getSchemaType();
+    method public boolean shouldIndexNestedProperties();
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig.Builder {
+    ctor public AppSearchSchema.DocumentPropertyConfig.Builder(String, String);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig.Builder {
+    ctor public AppSearchSchema.DoublePropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig.Builder {
+    ctor public AppSearchSchema.LongPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig.Builder setCardinality(int);
+  }
+
+  public abstract static class AppSearchSchema.PropertyConfig {
     method public int getCardinality();
-    method public int getDataType();
-    method public int getIndexingType();
     method public String getName();
-    method public String? getSchemaType();
-    method public int getTokenizerType();
     field public static final int CARDINALITY_OPTIONAL = 2; // 0x2
     field public static final int CARDINALITY_REPEATED = 1; // 0x1
     field public static final int CARDINALITY_REQUIRED = 3; // 0x3
-    field public static final int DATA_TYPE_BOOLEAN = 4; // 0x4
-    field public static final int DATA_TYPE_BYTES = 5; // 0x5
-    field public static final int DATA_TYPE_DOCUMENT = 6; // 0x6
-    field public static final int DATA_TYPE_DOUBLE = 3; // 0x3
-    field public static final int DATA_TYPE_INT64 = 2; // 0x2
-    field public static final int DATA_TYPE_STRING = 1; // 0x1
+  }
+
+  public static final class AppSearchSchema.StringPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public int getIndexingType();
+    method public int getTokenizerType();
     field public static final int INDEXING_TYPE_EXACT_TERMS = 1; // 0x1
     field public static final int INDEXING_TYPE_NONE = 0; // 0x0
     field public static final int INDEXING_TYPE_PREFIXES = 2; // 0x2
@@ -86,37 +167,41 @@
     field public static final int TOKENIZER_TYPE_PLAIN = 1; // 0x1
   }
 
-  public static final class AppSearchSchema.PropertyConfig.Builder {
-    ctor public AppSearchSchema.PropertyConfig.Builder(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig build();
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setCardinality(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setDataType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setIndexingType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setSchemaType(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setTokenizerType(int);
+  public static final class AppSearchSchema.StringPropertyConfig.Builder {
+    ctor public AppSearchSchema.StringPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setIndexingType(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setTokenizerType(int);
   }
 
   public interface AppSearchSession extends java.io.Closeable {
     method public void close();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByUri(androidx.appsearch.app.GetByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<androidx.appsearch.app.AppSearchSchema!>!> getSchema();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> putDocuments(androidx.appsearch.app.PutDocumentsRequest);
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> removeByQuery(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> removeByUri(androidx.appsearch.app.RemoveByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setSchema(androidx.appsearch.app.SetSchemaRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByDocumentId(androidx.appsearch.app.GetByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<java.lang.String!>!> getNamespaces();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.GetSchemaResponse!> getSchema();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.StorageInfo!> getStorageInfo();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> put(androidx.appsearch.app.PutDocumentsRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> remove(androidx.appsearch.app.RemoveByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> remove(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportUsage(androidx.appsearch.app.ReportUsageRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> requestFlush();
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.SetSchemaResponse!> setSchema(androidx.appsearch.app.SetSchemaRequest);
   }
 
-  public interface DataClassFactory<T> {
+  public interface DocumentClassFactory<T> {
     method public T fromGenericDocument(androidx.appsearch.app.GenericDocument) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.AppSearchSchema getSchema() throws androidx.appsearch.exceptions.AppSearchException;
-    method public String getSchemaType();
+    method public String getSchemaName();
     method public androidx.appsearch.app.GenericDocument toGenericDocument(T) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public class GenericDocument {
     ctor protected GenericDocument(androidx.appsearch.app.GenericDocument);
+    method public static androidx.appsearch.app.GenericDocument fromDocumentClass(Object) throws androidx.appsearch.exceptions.AppSearchException;
     method public long getCreationTimestampMillis();
+    method public String getId();
     method public static int getMaxIndexedProperties();
     method public String getNamespace();
     method public Object? getProperty(String);
@@ -136,15 +221,16 @@
     method public String getSchemaType();
     method public int getScore();
     method public long getTtlMillis();
-    method public String getUri();
-    method public <T> T toDataClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
-    field public static final String DEFAULT_NAMESPACE = "";
+    method public androidx.appsearch.app.GenericDocument.Builder<androidx.appsearch.app.GenericDocument.Builder<?>!> toBuilder();
+    method public <T> T toDocumentClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public static class GenericDocument.Builder<BuilderType extends androidx.appsearch.app.GenericDocument.Builder> {
-    ctor public GenericDocument.Builder(String, String);
+    ctor public GenericDocument.Builder(String, String, String);
     method public androidx.appsearch.app.GenericDocument build();
+    method public BuilderType clearProperty(String);
     method public BuilderType setCreationTimestampMillis(long);
+    method public BuilderType setId(String);
     method public BuilderType setNamespace(String);
     method public BuilderType setPropertyBoolean(String, boolean...);
     method public BuilderType setPropertyBytes(String, byte[]!...);
@@ -152,25 +238,49 @@
     method public BuilderType setPropertyDouble(String, double...);
     method public BuilderType setPropertyLong(String, long...);
     method public BuilderType setPropertyString(String, java.lang.String!...);
+    method public BuilderType setSchemaType(String);
     method public BuilderType setScore(@IntRange(from=0, to=java.lang.Integer.MAX_VALUE) int);
     method public BuilderType setTtlMillis(long);
   }
 
-  public final class GetByUriRequest {
+  public final class GetByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
+    method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
+    field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
   }
 
-  public static final class GetByUriRequest.Builder {
-    ctor public GetByUriRequest.Builder();
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.GetByUriRequest build();
-    method public androidx.appsearch.app.GetByUriRequest.Builder setNamespace(String);
+  public static final class GetByDocumentIdRequest.Builder {
+    ctor public GetByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addProjection(String, java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest build();
   }
 
-  public interface GlobalSearchSession {
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
+  public final class GetSchemaResponse {
+    method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
+    method @IntRange(from=0) public int getVersion();
+  }
+
+  public static final class GetSchemaResponse.Builder {
+    ctor public GetSchemaResponse.Builder();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder addSchema(androidx.appsearch.app.AppSearchSchema);
+    method public androidx.appsearch.app.GetSchemaResponse build();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder setVersion(@IntRange(from=0) int);
+  }
+
+  public interface GlobalSearchSession extends java.io.Closeable {
+    method public void close();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportSystemUsage(androidx.appsearch.app.ReportSystemUsageRequest);
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+  }
+
+  public abstract class Migrator {
+    ctor public Migrator();
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onDowngrade(int, int, androidx.appsearch.app.GenericDocument);
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onUpgrade(int, int, androidx.appsearch.app.GenericDocument);
+    method public abstract boolean shouldMigrate(int, int);
   }
 
   public class PackageIdentifier {
@@ -180,47 +290,92 @@
   }
 
   public final class PutDocumentsRequest {
-    method public java.util.List<androidx.appsearch.app.GenericDocument!> getDocuments();
+    method public java.util.List<androidx.appsearch.app.GenericDocument!> getGenericDocuments();
   }
 
   public static final class PutDocumentsRequest.Builder {
     ctor public PutDocumentsRequest.Builder();
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(androidx.appsearch.app.GenericDocument!...);
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(androidx.appsearch.app.GenericDocument!...);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
     method public androidx.appsearch.app.PutDocumentsRequest build();
   }
 
-  public final class RemoveByUriRequest {
+  public final class RemoveByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
   }
 
-  public static final class RemoveByUriRequest.Builder {
-    ctor public RemoveByUriRequest.Builder();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.RemoveByUriRequest build();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder setNamespace(String);
+  public static final class RemoveByDocumentIdRequest.Builder {
+    ctor public RemoveByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest build();
+  }
+
+  public final class ReportSystemUsageRequest {
+    method public String getDatabaseName();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getPackageName();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportSystemUsageRequest.Builder {
+    ctor public ReportSystemUsageRequest.Builder(String, String, String, String);
+    method public androidx.appsearch.app.ReportSystemUsageRequest build();
+    method public androidx.appsearch.app.ReportSystemUsageRequest.Builder setUsageTimestampMillis(long);
+  }
+
+  public final class ReportUsageRequest {
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportUsageRequest.Builder {
+    ctor public ReportUsageRequest.Builder(String, String);
+    method public androidx.appsearch.app.ReportUsageRequest build();
+    method public androidx.appsearch.app.ReportUsageRequest.Builder setUsageTimestampMillis(long);
   }
 
   public final class SearchResult {
-    method public androidx.appsearch.app.GenericDocument getDocument();
-    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatches();
+    method public String getDatabaseName();
+    method public <T> T getDocument(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.GenericDocument getGenericDocument();
+    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatchInfos();
     method public String getPackageName();
+    method public double getRankingSignal();
+  }
+
+  public static final class SearchResult.Builder {
+    ctor public SearchResult.Builder(String, String);
+    method public androidx.appsearch.app.SearchResult.Builder addMatchInfo(androidx.appsearch.app.SearchResult.MatchInfo);
+    method public androidx.appsearch.app.SearchResult build();
+    method public androidx.appsearch.app.SearchResult.Builder setDocument(Object) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchResult.Builder setGenericDocument(androidx.appsearch.app.GenericDocument);
+    method public androidx.appsearch.app.SearchResult.Builder setRankingSignal(double);
   }
 
   public static final class SearchResult.MatchInfo {
     method public CharSequence getExactMatch();
-    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchRange();
     method public String getFullText();
     method public String getPropertyPath();
     method public CharSequence getSnippet();
-    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetRange();
+  }
+
+  public static final class SearchResult.MatchInfo.Builder {
+    ctor public SearchResult.MatchInfo.Builder(String);
+    method public androidx.appsearch.app.SearchResult.MatchInfo build();
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setExactMatchRange(androidx.appsearch.app.SearchResult.MatchRange);
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setSnippetRange(androidx.appsearch.app.SearchResult.MatchRange);
   }
 
   public static final class SearchResult.MatchRange {
+    ctor public SearchResult.MatchRange(int, int);
     method public int getEnd();
     method public int getStart();
   }
@@ -231,16 +386,21 @@
   }
 
   public final class SearchSpec {
+    method public java.util.List<java.lang.String!> getFilterNamespaces();
+    method public java.util.List<java.lang.String!> getFilterPackageNames();
+    method public java.util.List<java.lang.String!> getFilterSchemas();
     method public int getMaxSnippetSize();
-    method public java.util.List<java.lang.String!> getNamespaces();
     method public int getOrder();
     method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
     method public int getRankingStrategy();
     method public int getResultCountPerPage();
-    method public java.util.List<java.lang.String!> getSchemaTypes();
+    method public int getResultGroupingLimit();
+    method public int getResultGroupingTypeFlags();
     method public int getSnippetCount();
     method public int getSnippetCountPerProperty();
     method public int getTermMatch();
+    field public static final int GROUPING_TYPE_PER_NAMESPACE = 2; // 0x2
+    field public static final int GROUPING_TYPE_PER_PACKAGE = 1; // 0x1
     field public static final int ORDER_ASCENDING = 1; // 0x1
     field public static final int ORDER_DESCENDING = 0; // 0x0
     field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
@@ -248,49 +408,102 @@
     field public static final int RANKING_STRATEGY_DOCUMENT_SCORE = 1; // 0x1
     field public static final int RANKING_STRATEGY_NONE = 0; // 0x0
     field public static final int RANKING_STRATEGY_RELEVANCE_SCORE = 3; // 0x3
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_COUNT = 6; // 0x6
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_LAST_USED_TIMESTAMP = 7; // 0x7
+    field public static final int RANKING_STRATEGY_USAGE_COUNT = 4; // 0x4
+    field public static final int RANKING_STRATEGY_USAGE_LAST_USED_TIMESTAMP = 5; // 0x5
     field public static final int TERM_MATCH_EXACT_ONLY = 1; // 0x1
     field public static final int TERM_MATCH_PREFIX = 2; // 0x2
   }
 
   public static final class SearchSpec.Builder {
     ctor public SearchSpec.Builder();
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec build();
     method public androidx.appsearch.app.SearchSpec.Builder setMaxSnippetSize(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setOrder(int);
     method public androidx.appsearch.app.SearchSpec.Builder setRankingStrategy(int);
     method public androidx.appsearch.app.SearchSpec.Builder setResultCountPerPage(@IntRange(from=0, to=0x2710) int);
+    method public androidx.appsearch.app.SearchSpec.Builder setResultGrouping(int, int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCount(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCountPerProperty(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setTermMatch(int);
   }
 
   public final class SetSchemaRequest {
+    method public java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!> getMigrators();
     method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
-    method public java.util.Set<java.lang.String!> getSchemasNotVisibleToSystemUi();
+    method public java.util.Set<java.lang.String!> getSchemasNotDisplayedBySystem();
     method public java.util.Map<java.lang.String!,java.util.Set<androidx.appsearch.app.PackageIdentifier!>!> getSchemasVisibleToPackages();
+    method @IntRange(from=1) public int getVersion();
     method public boolean isForceOverride();
   }
 
   public static final class SetSchemaRequest.Builder {
     ctor public SetSchemaRequest.Builder();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(androidx.appsearch.app.AppSearchSchema!...);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(androidx.appsearch.app.AppSearchSchema!...);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
     method public androidx.appsearch.app.SetSchemaRequest build();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForSystemUi(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassDisplayedBySystem(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.SetSchemaRequest.Builder setForceOverride(boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrator(String, androidx.appsearch.app.Migrator);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrators(java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeDisplayedBySystem(String, boolean);
     method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForPackage(String, boolean, androidx.appsearch.app.PackageIdentifier);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForSystemUi(String, boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setVersion(@IntRange(from=1) int);
+  }
+
+  public class SetSchemaResponse {
+    method public java.util.Set<java.lang.String!> getDeletedTypes();
+    method public java.util.Set<java.lang.String!> getIncompatibleTypes();
+    method public java.util.Set<java.lang.String!> getMigratedTypes();
+    method public java.util.List<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!> getMigrationFailures();
+  }
+
+  public static final class SetSchemaResponse.Builder {
+    ctor public SetSchemaResponse.Builder();
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailure(androidx.appsearch.app.SetSchemaResponse.MigrationFailure);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailures(java.util.Collection<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!>);
+    method public androidx.appsearch.app.SetSchemaResponse build();
+  }
+
+  public static class SetSchemaResponse.MigrationFailure {
+    ctor public SetSchemaResponse.MigrationFailure(String, String, String, androidx.appsearch.app.AppSearchResult<?>);
+    method public androidx.appsearch.app.AppSearchResult<java.lang.Void!> getAppSearchResult();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getSchemaType();
+  }
+
+  public class StorageInfo {
+    method public int getAliveDocumentsCount();
+    method public int getAliveNamespacesCount();
+    method public long getSizeBytes();
+  }
+
+  public static final class StorageInfo.Builder {
+    ctor public StorageInfo.Builder();
+    method public androidx.appsearch.app.StorageInfo build();
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveDocumentsCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveNamespacesCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setSizeBytes(long);
   }
 
 }
@@ -298,6 +511,9 @@
 package androidx.appsearch.exceptions {
 
   public class AppSearchException extends java.lang.Exception {
+    ctor public AppSearchException(int);
+    ctor public AppSearchException(int, String?);
+    ctor public AppSearchException(int, String?, Throwable?);
     method public int getResultCode();
     method public <T> androidx.appsearch.app.AppSearchResult<T!> toAppSearchResult();
   }

diff --git a/appsearch/appsearch/api/public_plus_experimental_current.txt b/appsearch/appsearch/api/public_plus_experimental_current.txt
index de75467..b5282d0 100644
--- a/appsearch/appsearch/api/public_plus_experimental_current.txt
+++ b/appsearch/appsearch/api/public_plus_experimental_current.txt

@@ -1,30 +1,56 @@
 // Signature format: 4.0
 package androidx.appsearch.annotation {
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface AppSearchDocument {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Document {
     method public abstract String name() default "";
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.CreationTimestampMillis {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Namespace {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Property {
-    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_NONE;
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BooleanProperty {
     method public abstract String name() default "";
     method public abstract boolean required() default false;
-    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Score {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BytesProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.TtlMillis {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.CreationTimestampMillis {
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Uri {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DocumentProperty {
+    method public abstract boolean indexNestedProperties() default false;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DoubleProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Id {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.LongProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Namespace {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Score {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.StringProperty {
+    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.TtlMillis {
   }
 
 }
@@ -32,16 +58,27 @@
 package androidx.appsearch.app {
 
   public final class AppSearchBatchResult<KeyType, ValueType> {
+    method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getAll();
     method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getFailures();
     method public java.util.Map<KeyType!,ValueType!> getSuccesses();
     method public boolean isSuccess();
   }
 
+  public static final class AppSearchBatchResult.Builder<KeyType, ValueType> {
+    ctor public AppSearchBatchResult.Builder();
+    method public androidx.appsearch.app.AppSearchBatchResult<KeyType!,ValueType!> build();
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setFailure(KeyType, int, String?);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setResult(KeyType, androidx.appsearch.app.AppSearchResult<ValueType!>);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setSuccess(KeyType, ValueType?);
+  }
+
   public final class AppSearchResult<ValueType> {
     method public String? getErrorMessage();
     method public int getResultCode();
     method public ValueType? getResultValue();
     method public boolean isSuccess();
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newFailedResult(int, String?);
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newSuccessfulResult(ValueType?);
     field public static final int RESULT_INTERNAL_ERROR = 2; // 0x2
     field public static final int RESULT_INVALID_ARGUMENT = 3; // 0x3
     field public static final int RESULT_INVALID_SCHEMA = 7; // 0x7
@@ -49,6 +86,7 @@
     field public static final int RESULT_NOT_FOUND = 6; // 0x6
     field public static final int RESULT_OK = 0; // 0x0
     field public static final int RESULT_OUT_OF_SPACE = 5; // 0x5
+    field public static final int RESULT_SECURITY_ERROR = 8; // 0x8
     field public static final int RESULT_UNKNOWN_ERROR = 1; // 0x1
   }
 
@@ -57,28 +95,71 @@
     method public String getSchemaType();
   }
 
+  public static final class AppSearchSchema.BooleanPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BooleanPropertyConfig.Builder {
+    ctor public AppSearchSchema.BooleanPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig.Builder setCardinality(int);
+  }
+
   public static final class AppSearchSchema.Builder {
     ctor public AppSearchSchema.Builder(String);
     method public androidx.appsearch.app.AppSearchSchema.Builder addProperty(androidx.appsearch.app.AppSearchSchema.PropertyConfig);
     method public androidx.appsearch.app.AppSearchSchema build();
   }
 
-  public static final class AppSearchSchema.PropertyConfig {
+  public static final class AppSearchSchema.BytesPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BytesPropertyConfig.Builder {
+    ctor public AppSearchSchema.BytesPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public String getSchemaType();
+    method public boolean shouldIndexNestedProperties();
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig.Builder {
+    ctor public AppSearchSchema.DocumentPropertyConfig.Builder(String, String);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig.Builder {
+    ctor public AppSearchSchema.DoublePropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig.Builder {
+    ctor public AppSearchSchema.LongPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig.Builder setCardinality(int);
+  }
+
+  public abstract static class AppSearchSchema.PropertyConfig {
     method public int getCardinality();
-    method public int getDataType();
-    method public int getIndexingType();
     method public String getName();
-    method public String? getSchemaType();
-    method public int getTokenizerType();
     field public static final int CARDINALITY_OPTIONAL = 2; // 0x2
     field public static final int CARDINALITY_REPEATED = 1; // 0x1
     field public static final int CARDINALITY_REQUIRED = 3; // 0x3
-    field public static final int DATA_TYPE_BOOLEAN = 4; // 0x4
-    field public static final int DATA_TYPE_BYTES = 5; // 0x5
-    field public static final int DATA_TYPE_DOCUMENT = 6; // 0x6
-    field public static final int DATA_TYPE_DOUBLE = 3; // 0x3
-    field public static final int DATA_TYPE_INT64 = 2; // 0x2
-    field public static final int DATA_TYPE_STRING = 1; // 0x1
+  }
+
+  public static final class AppSearchSchema.StringPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public int getIndexingType();
+    method public int getTokenizerType();
     field public static final int INDEXING_TYPE_EXACT_TERMS = 1; // 0x1
     field public static final int INDEXING_TYPE_NONE = 0; // 0x0
     field public static final int INDEXING_TYPE_PREFIXES = 2; // 0x2
@@ -86,37 +167,41 @@
     field public static final int TOKENIZER_TYPE_PLAIN = 1; // 0x1
   }
 
-  public static final class AppSearchSchema.PropertyConfig.Builder {
-    ctor public AppSearchSchema.PropertyConfig.Builder(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig build();
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setCardinality(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setDataType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setIndexingType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setSchemaType(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setTokenizerType(int);
+  public static final class AppSearchSchema.StringPropertyConfig.Builder {
+    ctor public AppSearchSchema.StringPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setIndexingType(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setTokenizerType(int);
   }
 
   public interface AppSearchSession extends java.io.Closeable {
     method public void close();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByUri(androidx.appsearch.app.GetByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<androidx.appsearch.app.AppSearchSchema!>!> getSchema();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> putDocuments(androidx.appsearch.app.PutDocumentsRequest);
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> removeByQuery(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> removeByUri(androidx.appsearch.app.RemoveByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setSchema(androidx.appsearch.app.SetSchemaRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByDocumentId(androidx.appsearch.app.GetByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<java.lang.String!>!> getNamespaces();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.GetSchemaResponse!> getSchema();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.StorageInfo!> getStorageInfo();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> put(androidx.appsearch.app.PutDocumentsRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> remove(androidx.appsearch.app.RemoveByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> remove(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportUsage(androidx.appsearch.app.ReportUsageRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> requestFlush();
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.SetSchemaResponse!> setSchema(androidx.appsearch.app.SetSchemaRequest);
   }
 
-  public interface DataClassFactory<T> {
+  public interface DocumentClassFactory<T> {
     method public T fromGenericDocument(androidx.appsearch.app.GenericDocument) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.AppSearchSchema getSchema() throws androidx.appsearch.exceptions.AppSearchException;
-    method public String getSchemaType();
+    method public String getSchemaName();
     method public androidx.appsearch.app.GenericDocument toGenericDocument(T) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public class GenericDocument {
     ctor protected GenericDocument(androidx.appsearch.app.GenericDocument);
+    method public static androidx.appsearch.app.GenericDocument fromDocumentClass(Object) throws androidx.appsearch.exceptions.AppSearchException;
     method public long getCreationTimestampMillis();
+    method public String getId();
     method public static int getMaxIndexedProperties();
     method public String getNamespace();
     method public Object? getProperty(String);
@@ -136,15 +221,16 @@
     method public String getSchemaType();
     method public int getScore();
     method public long getTtlMillis();
-    method public String getUri();
-    method public <T> T toDataClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
-    field public static final String DEFAULT_NAMESPACE = "";
+    method public androidx.appsearch.app.GenericDocument.Builder<androidx.appsearch.app.GenericDocument.Builder<?>!> toBuilder();
+    method public <T> T toDocumentClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public static class GenericDocument.Builder<BuilderType extends androidx.appsearch.app.GenericDocument.Builder> {
-    ctor public GenericDocument.Builder(String, String);
+    ctor public GenericDocument.Builder(String, String, String);
     method public androidx.appsearch.app.GenericDocument build();
+    method public BuilderType clearProperty(String);
     method public BuilderType setCreationTimestampMillis(long);
+    method public BuilderType setId(String);
     method public BuilderType setNamespace(String);
     method public BuilderType setPropertyBoolean(String, boolean...);
     method public BuilderType setPropertyBytes(String, byte[]!...);
@@ -152,25 +238,49 @@
     method public BuilderType setPropertyDouble(String, double...);
     method public BuilderType setPropertyLong(String, long...);
     method public BuilderType setPropertyString(String, java.lang.String!...);
+    method public BuilderType setSchemaType(String);
     method public BuilderType setScore(@IntRange(from=0, to=java.lang.Integer.MAX_VALUE) int);
     method public BuilderType setTtlMillis(long);
   }
 
-  public final class GetByUriRequest {
+  public final class GetByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
+    method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
+    field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
   }
 
-  public static final class GetByUriRequest.Builder {
-    ctor public GetByUriRequest.Builder();
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.GetByUriRequest build();
-    method public androidx.appsearch.app.GetByUriRequest.Builder setNamespace(String);
+  public static final class GetByDocumentIdRequest.Builder {
+    ctor public GetByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addProjection(String, java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest build();
   }
 
-  public interface GlobalSearchSession {
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
+  public final class GetSchemaResponse {
+    method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
+    method @IntRange(from=0) public int getVersion();
+  }
+
+  public static final class GetSchemaResponse.Builder {
+    ctor public GetSchemaResponse.Builder();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder addSchema(androidx.appsearch.app.AppSearchSchema);
+    method public androidx.appsearch.app.GetSchemaResponse build();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder setVersion(@IntRange(from=0) int);
+  }
+
+  public interface GlobalSearchSession extends java.io.Closeable {
+    method public void close();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportSystemUsage(androidx.appsearch.app.ReportSystemUsageRequest);
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+  }
+
+  public abstract class Migrator {
+    ctor public Migrator();
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onDowngrade(int, int, androidx.appsearch.app.GenericDocument);
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onUpgrade(int, int, androidx.appsearch.app.GenericDocument);
+    method public abstract boolean shouldMigrate(int, int);
   }
 
   public class PackageIdentifier {
@@ -180,47 +290,92 @@
   }
 
   public final class PutDocumentsRequest {
-    method public java.util.List<androidx.appsearch.app.GenericDocument!> getDocuments();
+    method public java.util.List<androidx.appsearch.app.GenericDocument!> getGenericDocuments();
   }
 
   public static final class PutDocumentsRequest.Builder {
     ctor public PutDocumentsRequest.Builder();
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(androidx.appsearch.app.GenericDocument!...);
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(androidx.appsearch.app.GenericDocument!...);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
     method public androidx.appsearch.app.PutDocumentsRequest build();
   }
 
-  public final class RemoveByUriRequest {
+  public final class RemoveByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
   }
 
-  public static final class RemoveByUriRequest.Builder {
-    ctor public RemoveByUriRequest.Builder();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.RemoveByUriRequest build();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder setNamespace(String);
+  public static final class RemoveByDocumentIdRequest.Builder {
+    ctor public RemoveByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest build();
+  }
+
+  public final class ReportSystemUsageRequest {
+    method public String getDatabaseName();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getPackageName();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportSystemUsageRequest.Builder {
+    ctor public ReportSystemUsageRequest.Builder(String, String, String, String);
+    method public androidx.appsearch.app.ReportSystemUsageRequest build();
+    method public androidx.appsearch.app.ReportSystemUsageRequest.Builder setUsageTimestampMillis(long);
+  }
+
+  public final class ReportUsageRequest {
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportUsageRequest.Builder {
+    ctor public ReportUsageRequest.Builder(String, String);
+    method public androidx.appsearch.app.ReportUsageRequest build();
+    method public androidx.appsearch.app.ReportUsageRequest.Builder setUsageTimestampMillis(long);
   }
 
   public final class SearchResult {
-    method public androidx.appsearch.app.GenericDocument getDocument();
-    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatches();
+    method public String getDatabaseName();
+    method public <T> T getDocument(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.GenericDocument getGenericDocument();
+    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatchInfos();
     method public String getPackageName();
+    method public double getRankingSignal();
+  }
+
+  public static final class SearchResult.Builder {
+    ctor public SearchResult.Builder(String, String);
+    method public androidx.appsearch.app.SearchResult.Builder addMatchInfo(androidx.appsearch.app.SearchResult.MatchInfo);
+    method public androidx.appsearch.app.SearchResult build();
+    method public androidx.appsearch.app.SearchResult.Builder setDocument(Object) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchResult.Builder setGenericDocument(androidx.appsearch.app.GenericDocument);
+    method public androidx.appsearch.app.SearchResult.Builder setRankingSignal(double);
   }
 
   public static final class SearchResult.MatchInfo {
     method public CharSequence getExactMatch();
-    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchRange();
     method public String getFullText();
     method public String getPropertyPath();
     method public CharSequence getSnippet();
-    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetRange();
+  }
+
+  public static final class SearchResult.MatchInfo.Builder {
+    ctor public SearchResult.MatchInfo.Builder(String);
+    method public androidx.appsearch.app.SearchResult.MatchInfo build();
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setExactMatchRange(androidx.appsearch.app.SearchResult.MatchRange);
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setSnippetRange(androidx.appsearch.app.SearchResult.MatchRange);
   }
 
   public static final class SearchResult.MatchRange {
+    ctor public SearchResult.MatchRange(int, int);
     method public int getEnd();
     method public int getStart();
   }
@@ -231,16 +386,21 @@
   }
 
   public final class SearchSpec {
+    method public java.util.List<java.lang.String!> getFilterNamespaces();
+    method public java.util.List<java.lang.String!> getFilterPackageNames();
+    method public java.util.List<java.lang.String!> getFilterSchemas();
     method public int getMaxSnippetSize();
-    method public java.util.List<java.lang.String!> getNamespaces();
     method public int getOrder();
     method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
     method public int getRankingStrategy();
     method public int getResultCountPerPage();
-    method public java.util.List<java.lang.String!> getSchemaTypes();
+    method public int getResultGroupingLimit();
+    method public int getResultGroupingTypeFlags();
     method public int getSnippetCount();
     method public int getSnippetCountPerProperty();
     method public int getTermMatch();
+    field public static final int GROUPING_TYPE_PER_NAMESPACE = 2; // 0x2
+    field public static final int GROUPING_TYPE_PER_PACKAGE = 1; // 0x1
     field public static final int ORDER_ASCENDING = 1; // 0x1
     field public static final int ORDER_DESCENDING = 0; // 0x0
     field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
@@ -248,49 +408,102 @@
     field public static final int RANKING_STRATEGY_DOCUMENT_SCORE = 1; // 0x1
     field public static final int RANKING_STRATEGY_NONE = 0; // 0x0
     field public static final int RANKING_STRATEGY_RELEVANCE_SCORE = 3; // 0x3
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_COUNT = 6; // 0x6
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_LAST_USED_TIMESTAMP = 7; // 0x7
+    field public static final int RANKING_STRATEGY_USAGE_COUNT = 4; // 0x4
+    field public static final int RANKING_STRATEGY_USAGE_LAST_USED_TIMESTAMP = 5; // 0x5
     field public static final int TERM_MATCH_EXACT_ONLY = 1; // 0x1
     field public static final int TERM_MATCH_PREFIX = 2; // 0x2
   }
 
   public static final class SearchSpec.Builder {
     ctor public SearchSpec.Builder();
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec build();
     method public androidx.appsearch.app.SearchSpec.Builder setMaxSnippetSize(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setOrder(int);
     method public androidx.appsearch.app.SearchSpec.Builder setRankingStrategy(int);
     method public androidx.appsearch.app.SearchSpec.Builder setResultCountPerPage(@IntRange(from=0, to=0x2710) int);
+    method public androidx.appsearch.app.SearchSpec.Builder setResultGrouping(int, int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCount(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCountPerProperty(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setTermMatch(int);
   }
 
   public final class SetSchemaRequest {
+    method public java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!> getMigrators();
     method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
-    method public java.util.Set<java.lang.String!> getSchemasNotVisibleToSystemUi();
+    method public java.util.Set<java.lang.String!> getSchemasNotDisplayedBySystem();
     method public java.util.Map<java.lang.String!,java.util.Set<androidx.appsearch.app.PackageIdentifier!>!> getSchemasVisibleToPackages();
+    method @IntRange(from=1) public int getVersion();
     method public boolean isForceOverride();
   }
 
   public static final class SetSchemaRequest.Builder {
     ctor public SetSchemaRequest.Builder();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(androidx.appsearch.app.AppSearchSchema!...);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(androidx.appsearch.app.AppSearchSchema!...);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
     method public androidx.appsearch.app.SetSchemaRequest build();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForSystemUi(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassDisplayedBySystem(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.SetSchemaRequest.Builder setForceOverride(boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrator(String, androidx.appsearch.app.Migrator);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrators(java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeDisplayedBySystem(String, boolean);
     method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForPackage(String, boolean, androidx.appsearch.app.PackageIdentifier);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForSystemUi(String, boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setVersion(@IntRange(from=1) int);
+  }
+
+  public class SetSchemaResponse {
+    method public java.util.Set<java.lang.String!> getDeletedTypes();
+    method public java.util.Set<java.lang.String!> getIncompatibleTypes();
+    method public java.util.Set<java.lang.String!> getMigratedTypes();
+    method public java.util.List<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!> getMigrationFailures();
+  }
+
+  public static final class SetSchemaResponse.Builder {
+    ctor public SetSchemaResponse.Builder();
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailure(androidx.appsearch.app.SetSchemaResponse.MigrationFailure);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailures(java.util.Collection<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!>);
+    method public androidx.appsearch.app.SetSchemaResponse build();
+  }
+
+  public static class SetSchemaResponse.MigrationFailure {
+    ctor public SetSchemaResponse.MigrationFailure(String, String, String, androidx.appsearch.app.AppSearchResult<?>);
+    method public androidx.appsearch.app.AppSearchResult<java.lang.Void!> getAppSearchResult();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getSchemaType();
+  }
+
+  public class StorageInfo {
+    method public int getAliveDocumentsCount();
+    method public int getAliveNamespacesCount();
+    method public long getSizeBytes();
+  }
+
+  public static final class StorageInfo.Builder {
+    ctor public StorageInfo.Builder();
+    method public androidx.appsearch.app.StorageInfo build();
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveDocumentsCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveNamespacesCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setSizeBytes(long);
   }
 
 }
@@ -298,6 +511,9 @@
 package androidx.appsearch.exceptions {
 
   public class AppSearchException extends java.lang.Exception {
+    ctor public AppSearchException(int);
+    ctor public AppSearchException(int, String?);
+    ctor public AppSearchException(int, String?, Throwable?);
     method public int getResultCode();
     method public <T> androidx.appsearch.app.AppSearchResult<T!> toAppSearchResult();
   }

diff --git a/appsearch/appsearch/api/restricted_current.txt b/appsearch/appsearch/api/restricted_current.txt
index de75467..b5282d0 100644
--- a/appsearch/appsearch/api/restricted_current.txt
+++ b/appsearch/appsearch/api/restricted_current.txt

@@ -1,30 +1,56 @@
 // Signature format: 4.0
 package androidx.appsearch.annotation {
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface AppSearchDocument {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Document {
     method public abstract String name() default "";
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.CreationTimestampMillis {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Namespace {
-  }
-
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Property {
-    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_NONE;
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BooleanProperty {
     method public abstract String name() default "";
     method public abstract boolean required() default false;
-    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Score {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.BytesProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.TtlMillis {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.CreationTimestampMillis {
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.FIELD) public static @interface AppSearchDocument.Uri {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DocumentProperty {
+    method public abstract boolean indexNestedProperties() default false;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.DoubleProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Id {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.LongProperty {
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Namespace {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.Score {
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.StringProperty {
+    method public abstract int indexingType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE;
+    method public abstract String name() default "";
+    method public abstract boolean required() default false;
+    method public abstract int tokenizerType() default androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN;
+  }
+
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public static @interface Document.TtlMillis {
   }
 
 }
@@ -32,16 +58,27 @@
 package androidx.appsearch.app {
 
   public final class AppSearchBatchResult<KeyType, ValueType> {
+    method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getAll();
     method public java.util.Map<KeyType!,androidx.appsearch.app.AppSearchResult<ValueType!>!> getFailures();
     method public java.util.Map<KeyType!,ValueType!> getSuccesses();
     method public boolean isSuccess();
   }
 
+  public static final class AppSearchBatchResult.Builder<KeyType, ValueType> {
+    ctor public AppSearchBatchResult.Builder();
+    method public androidx.appsearch.app.AppSearchBatchResult<KeyType!,ValueType!> build();
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setFailure(KeyType, int, String?);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setResult(KeyType, androidx.appsearch.app.AppSearchResult<ValueType!>);
+    method public androidx.appsearch.app.AppSearchBatchResult.Builder<KeyType!,ValueType!> setSuccess(KeyType, ValueType?);
+  }
+
   public final class AppSearchResult<ValueType> {
     method public String? getErrorMessage();
     method public int getResultCode();
     method public ValueType? getResultValue();
     method public boolean isSuccess();
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newFailedResult(int, String?);
+    method public static <ValueType> androidx.appsearch.app.AppSearchResult<ValueType!> newSuccessfulResult(ValueType?);
     field public static final int RESULT_INTERNAL_ERROR = 2; // 0x2
     field public static final int RESULT_INVALID_ARGUMENT = 3; // 0x3
     field public static final int RESULT_INVALID_SCHEMA = 7; // 0x7
@@ -49,6 +86,7 @@
     field public static final int RESULT_NOT_FOUND = 6; // 0x6
     field public static final int RESULT_OK = 0; // 0x0
     field public static final int RESULT_OUT_OF_SPACE = 5; // 0x5
+    field public static final int RESULT_SECURITY_ERROR = 8; // 0x8
     field public static final int RESULT_UNKNOWN_ERROR = 1; // 0x1
   }
 
@@ -57,28 +95,71 @@
     method public String getSchemaType();
   }
 
+  public static final class AppSearchSchema.BooleanPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BooleanPropertyConfig.Builder {
+    ctor public AppSearchSchema.BooleanPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BooleanPropertyConfig.Builder setCardinality(int);
+  }
+
   public static final class AppSearchSchema.Builder {
     ctor public AppSearchSchema.Builder(String);
     method public androidx.appsearch.app.AppSearchSchema.Builder addProperty(androidx.appsearch.app.AppSearchSchema.PropertyConfig);
     method public androidx.appsearch.app.AppSearchSchema build();
   }
 
-  public static final class AppSearchSchema.PropertyConfig {
+  public static final class AppSearchSchema.BytesPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.BytesPropertyConfig.Builder {
+    ctor public AppSearchSchema.BytesPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.BytesPropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public String getSchemaType();
+    method public boolean shouldIndexNestedProperties();
+  }
+
+  public static final class AppSearchSchema.DocumentPropertyConfig.Builder {
+    ctor public AppSearchSchema.DocumentPropertyConfig.Builder(String, String);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.DoublePropertyConfig.Builder {
+    ctor public AppSearchSchema.DoublePropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.DoublePropertyConfig.Builder setCardinality(int);
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+  }
+
+  public static final class AppSearchSchema.LongPropertyConfig.Builder {
+    ctor public AppSearchSchema.LongPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.LongPropertyConfig.Builder setCardinality(int);
+  }
+
+  public abstract static class AppSearchSchema.PropertyConfig {
     method public int getCardinality();
-    method public int getDataType();
-    method public int getIndexingType();
     method public String getName();
-    method public String? getSchemaType();
-    method public int getTokenizerType();
     field public static final int CARDINALITY_OPTIONAL = 2; // 0x2
     field public static final int CARDINALITY_REPEATED = 1; // 0x1
     field public static final int CARDINALITY_REQUIRED = 3; // 0x3
-    field public static final int DATA_TYPE_BOOLEAN = 4; // 0x4
-    field public static final int DATA_TYPE_BYTES = 5; // 0x5
-    field public static final int DATA_TYPE_DOCUMENT = 6; // 0x6
-    field public static final int DATA_TYPE_DOUBLE = 3; // 0x3
-    field public static final int DATA_TYPE_INT64 = 2; // 0x2
-    field public static final int DATA_TYPE_STRING = 1; // 0x1
+  }
+
+  public static final class AppSearchSchema.StringPropertyConfig extends androidx.appsearch.app.AppSearchSchema.PropertyConfig {
+    method public int getIndexingType();
+    method public int getTokenizerType();
     field public static final int INDEXING_TYPE_EXACT_TERMS = 1; // 0x1
     field public static final int INDEXING_TYPE_NONE = 0; // 0x0
     field public static final int INDEXING_TYPE_PREFIXES = 2; // 0x2
@@ -86,37 +167,41 @@
     field public static final int TOKENIZER_TYPE_PLAIN = 1; // 0x1
   }
 
-  public static final class AppSearchSchema.PropertyConfig.Builder {
-    ctor public AppSearchSchema.PropertyConfig.Builder(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig build();
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setCardinality(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setDataType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setIndexingType(int);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setSchemaType(String);
-    method public androidx.appsearch.app.AppSearchSchema.PropertyConfig.Builder setTokenizerType(int);
+  public static final class AppSearchSchema.StringPropertyConfig.Builder {
+    ctor public AppSearchSchema.StringPropertyConfig.Builder(String);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig build();
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setCardinality(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setIndexingType(int);
+    method public androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.Builder setTokenizerType(int);
   }
 
   public interface AppSearchSession extends java.io.Closeable {
     method public void close();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByUri(androidx.appsearch.app.GetByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<androidx.appsearch.app.AppSearchSchema!>!> getSchema();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> putDocuments(androidx.appsearch.app.PutDocumentsRequest);
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> removeByQuery(String, androidx.appsearch.app.SearchSpec);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> removeByUri(androidx.appsearch.app.RemoveByUriRequest);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setSchema(androidx.appsearch.app.SetSchemaRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,androidx.appsearch.app.GenericDocument!>!> getByDocumentId(androidx.appsearch.app.GetByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.util.Set<java.lang.String!>!> getNamespaces();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.GetSchemaResponse!> getSchema();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.StorageInfo!> getStorageInfo();
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> put(androidx.appsearch.app.PutDocumentsRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.AppSearchBatchResult<java.lang.String!,java.lang.Void!>!> remove(androidx.appsearch.app.RemoveByDocumentIdRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> remove(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportUsage(androidx.appsearch.app.ReportUsageRequest);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> requestFlush();
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.appsearch.app.SetSchemaResponse!> setSchema(androidx.appsearch.app.SetSchemaRequest);
   }
 
-  public interface DataClassFactory<T> {
+  public interface DocumentClassFactory<T> {
     method public T fromGenericDocument(androidx.appsearch.app.GenericDocument) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.AppSearchSchema getSchema() throws androidx.appsearch.exceptions.AppSearchException;
-    method public String getSchemaType();
+    method public String getSchemaName();
     method public androidx.appsearch.app.GenericDocument toGenericDocument(T) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public class GenericDocument {
     ctor protected GenericDocument(androidx.appsearch.app.GenericDocument);
+    method public static androidx.appsearch.app.GenericDocument fromDocumentClass(Object) throws androidx.appsearch.exceptions.AppSearchException;
     method public long getCreationTimestampMillis();
+    method public String getId();
     method public static int getMaxIndexedProperties();
     method public String getNamespace();
     method public Object? getProperty(String);
@@ -136,15 +221,16 @@
     method public String getSchemaType();
     method public int getScore();
     method public long getTtlMillis();
-    method public String getUri();
-    method public <T> T toDataClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
-    field public static final String DEFAULT_NAMESPACE = "";
+    method public androidx.appsearch.app.GenericDocument.Builder<androidx.appsearch.app.GenericDocument.Builder<?>!> toBuilder();
+    method public <T> T toDocumentClass(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
   }
 
   public static class GenericDocument.Builder<BuilderType extends androidx.appsearch.app.GenericDocument.Builder> {
-    ctor public GenericDocument.Builder(String, String);
+    ctor public GenericDocument.Builder(String, String, String);
     method public androidx.appsearch.app.GenericDocument build();
+    method public BuilderType clearProperty(String);
     method public BuilderType setCreationTimestampMillis(long);
+    method public BuilderType setId(String);
     method public BuilderType setNamespace(String);
     method public BuilderType setPropertyBoolean(String, boolean...);
     method public BuilderType setPropertyBytes(String, byte[]!...);
@@ -152,25 +238,49 @@
     method public BuilderType setPropertyDouble(String, double...);
     method public BuilderType setPropertyLong(String, long...);
     method public BuilderType setPropertyString(String, java.lang.String!...);
+    method public BuilderType setSchemaType(String);
     method public BuilderType setScore(@IntRange(from=0, to=java.lang.Integer.MAX_VALUE) int);
     method public BuilderType setTtlMillis(long);
   }
 
-  public final class GetByUriRequest {
+  public final class GetByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
+    method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
+    field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
   }
 
-  public static final class GetByUriRequest.Builder {
-    ctor public GetByUriRequest.Builder();
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.GetByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.GetByUriRequest build();
-    method public androidx.appsearch.app.GetByUriRequest.Builder setNamespace(String);
+  public static final class GetByDocumentIdRequest.Builder {
+    ctor public GetByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest.Builder addProjection(String, java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.GetByDocumentIdRequest build();
   }
 
-  public interface GlobalSearchSession {
-    method public androidx.appsearch.app.SearchResults query(String, androidx.appsearch.app.SearchSpec);
+  public final class GetSchemaResponse {
+    method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
+    method @IntRange(from=0) public int getVersion();
+  }
+
+  public static final class GetSchemaResponse.Builder {
+    ctor public GetSchemaResponse.Builder();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder addSchema(androidx.appsearch.app.AppSearchSchema);
+    method public androidx.appsearch.app.GetSchemaResponse build();
+    method public androidx.appsearch.app.GetSchemaResponse.Builder setVersion(@IntRange(from=0) int);
+  }
+
+  public interface GlobalSearchSession extends java.io.Closeable {
+    method public void close();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> reportSystemUsage(androidx.appsearch.app.ReportSystemUsageRequest);
+    method public androidx.appsearch.app.SearchResults search(String, androidx.appsearch.app.SearchSpec);
+  }
+
+  public abstract class Migrator {
+    ctor public Migrator();
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onDowngrade(int, int, androidx.appsearch.app.GenericDocument);
+    method @WorkerThread public abstract androidx.appsearch.app.GenericDocument onUpgrade(int, int, androidx.appsearch.app.GenericDocument);
+    method public abstract boolean shouldMigrate(int, int);
   }
 
   public class PackageIdentifier {
@@ -180,47 +290,92 @@
   }
 
   public final class PutDocumentsRequest {
-    method public java.util.List<androidx.appsearch.app.GenericDocument!> getDocuments();
+    method public java.util.List<androidx.appsearch.app.GenericDocument!> getGenericDocuments();
   }
 
   public static final class PutDocumentsRequest.Builder {
     ctor public PutDocumentsRequest.Builder();
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDataClass(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(androidx.appsearch.app.GenericDocument!...);
-    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocument(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.lang.Object!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addDocuments(java.util.Collection<?>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(androidx.appsearch.app.GenericDocument!...);
+    method public androidx.appsearch.app.PutDocumentsRequest.Builder addGenericDocuments(java.util.Collection<? extends androidx.appsearch.app.GenericDocument>);
     method public androidx.appsearch.app.PutDocumentsRequest build();
   }
 
-  public final class RemoveByUriRequest {
+  public final class RemoveByDocumentIdRequest {
+    method public java.util.Set<java.lang.String!> getIds();
     method public String getNamespace();
-    method public java.util.Set<java.lang.String!> getUris();
   }
 
-  public static final class RemoveByUriRequest.Builder {
-    ctor public RemoveByUriRequest.Builder();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.lang.String!...);
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder addUri(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.RemoveByUriRequest build();
-    method public androidx.appsearch.app.RemoveByUriRequest.Builder setNamespace(String);
+  public static final class RemoveByDocumentIdRequest.Builder {
+    ctor public RemoveByDocumentIdRequest.Builder(String);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.lang.String!...);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest.Builder addIds(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.RemoveByDocumentIdRequest build();
+  }
+
+  public final class ReportSystemUsageRequest {
+    method public String getDatabaseName();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getPackageName();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportSystemUsageRequest.Builder {
+    ctor public ReportSystemUsageRequest.Builder(String, String, String, String);
+    method public androidx.appsearch.app.ReportSystemUsageRequest build();
+    method public androidx.appsearch.app.ReportSystemUsageRequest.Builder setUsageTimestampMillis(long);
+  }
+
+  public final class ReportUsageRequest {
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public long getUsageTimestampMillis();
+  }
+
+  public static final class ReportUsageRequest.Builder {
+    ctor public ReportUsageRequest.Builder(String, String);
+    method public androidx.appsearch.app.ReportUsageRequest build();
+    method public androidx.appsearch.app.ReportUsageRequest.Builder setUsageTimestampMillis(long);
   }
 
   public final class SearchResult {
-    method public androidx.appsearch.app.GenericDocument getDocument();
-    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatches();
+    method public String getDatabaseName();
+    method public <T> T getDocument(Class<T!>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.GenericDocument getGenericDocument();
+    method public java.util.List<androidx.appsearch.app.SearchResult.MatchInfo!> getMatchInfos();
     method public String getPackageName();
+    method public double getRankingSignal();
+  }
+
+  public static final class SearchResult.Builder {
+    ctor public SearchResult.Builder(String, String);
+    method public androidx.appsearch.app.SearchResult.Builder addMatchInfo(androidx.appsearch.app.SearchResult.MatchInfo);
+    method public androidx.appsearch.app.SearchResult build();
+    method public androidx.appsearch.app.SearchResult.Builder setDocument(Object) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchResult.Builder setGenericDocument(androidx.appsearch.app.GenericDocument);
+    method public androidx.appsearch.app.SearchResult.Builder setRankingSignal(double);
   }
 
   public static final class SearchResult.MatchInfo {
     method public CharSequence getExactMatch();
-    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getExactMatchRange();
     method public String getFullText();
     method public String getPropertyPath();
     method public CharSequence getSnippet();
-    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetPosition();
+    method public androidx.appsearch.app.SearchResult.MatchRange getSnippetRange();
+  }
+
+  public static final class SearchResult.MatchInfo.Builder {
+    ctor public SearchResult.MatchInfo.Builder(String);
+    method public androidx.appsearch.app.SearchResult.MatchInfo build();
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setExactMatchRange(androidx.appsearch.app.SearchResult.MatchRange);
+    method public androidx.appsearch.app.SearchResult.MatchInfo.Builder setSnippetRange(androidx.appsearch.app.SearchResult.MatchRange);
   }
 
   public static final class SearchResult.MatchRange {
+    ctor public SearchResult.MatchRange(int, int);
     method public int getEnd();
     method public int getStart();
   }
@@ -231,16 +386,21 @@
   }
 
   public final class SearchSpec {
+    method public java.util.List<java.lang.String!> getFilterNamespaces();
+    method public java.util.List<java.lang.String!> getFilterPackageNames();
+    method public java.util.List<java.lang.String!> getFilterSchemas();
     method public int getMaxSnippetSize();
-    method public java.util.List<java.lang.String!> getNamespaces();
     method public int getOrder();
     method public java.util.Map<java.lang.String!,java.util.List<java.lang.String!>!> getProjections();
     method public int getRankingStrategy();
     method public int getResultCountPerPage();
-    method public java.util.List<java.lang.String!> getSchemaTypes();
+    method public int getResultGroupingLimit();
+    method public int getResultGroupingTypeFlags();
     method public int getSnippetCount();
     method public int getSnippetCountPerProperty();
     method public int getTermMatch();
+    field public static final int GROUPING_TYPE_PER_NAMESPACE = 2; // 0x2
+    field public static final int GROUPING_TYPE_PER_PACKAGE = 1; // 0x1
     field public static final int ORDER_ASCENDING = 1; // 0x1
     field public static final int ORDER_DESCENDING = 0; // 0x0
     field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
@@ -248,49 +408,102 @@
     field public static final int RANKING_STRATEGY_DOCUMENT_SCORE = 1; // 0x1
     field public static final int RANKING_STRATEGY_NONE = 0; // 0x0
     field public static final int RANKING_STRATEGY_RELEVANCE_SCORE = 3; // 0x3
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_COUNT = 6; // 0x6
+    field public static final int RANKING_STRATEGY_SYSTEM_USAGE_LAST_USED_TIMESTAMP = 7; // 0x7
+    field public static final int RANKING_STRATEGY_USAGE_COUNT = 4; // 0x4
+    field public static final int RANKING_STRATEGY_USAGE_LAST_USED_TIMESTAMP = 5; // 0x5
     field public static final int TERM_MATCH_EXACT_ONLY = 1; // 0x1
     field public static final int TERM_MATCH_PREFIX = 2; // 0x2
   }
 
   public static final class SearchSpec.Builder {
     ctor public SearchSpec.Builder();
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addNamespace(java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterNamespaces(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterPackageNames(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.lang.String!...);
+    method public androidx.appsearch.app.SearchSpec.Builder addFilterSchemas(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec.Builder addProjection(String, java.util.Collection<java.lang.String!>);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaByDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.lang.String!...);
-    method public androidx.appsearch.app.SearchSpec.Builder addSchemaType(java.util.Collection<java.lang.String!>);
     method public androidx.appsearch.app.SearchSpec build();
     method public androidx.appsearch.app.SearchSpec.Builder setMaxSnippetSize(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setOrder(int);
     method public androidx.appsearch.app.SearchSpec.Builder setRankingStrategy(int);
     method public androidx.appsearch.app.SearchSpec.Builder setResultCountPerPage(@IntRange(from=0, to=0x2710) int);
+    method public androidx.appsearch.app.SearchSpec.Builder setResultGrouping(int, int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCount(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setSnippetCountPerProperty(@IntRange(from=0, to=0x2710) int);
     method public androidx.appsearch.app.SearchSpec.Builder setTermMatch(int);
   }
 
   public final class SetSchemaRequest {
+    method public java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!> getMigrators();
     method public java.util.Set<androidx.appsearch.app.AppSearchSchema!> getSchemas();
-    method public java.util.Set<java.lang.String!> getSchemasNotVisibleToSystemUi();
+    method public java.util.Set<java.lang.String!> getSchemasNotDisplayedBySystem();
     method public java.util.Map<java.lang.String!,java.util.Set<androidx.appsearch.app.PackageIdentifier!>!> getSchemasVisibleToPackages();
+    method @IntRange(from=1) public int getVersion();
     method public boolean isForceOverride();
   }
 
   public static final class SetSchemaRequest.Builder {
     ctor public SetSchemaRequest.Builder();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addDataClass(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(androidx.appsearch.app.AppSearchSchema!...);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchema(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(Class<?>!...) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addDocumentClasses(java.util.Collection<? extends java.lang.Class<?>>) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(androidx.appsearch.app.AppSearchSchema!...);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder addSchemas(java.util.Collection<androidx.appsearch.app.AppSearchSchema!>);
     method public androidx.appsearch.app.SetSchemaRequest build();
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setDataClassVisibilityForSystemUi(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassDisplayedBySystem(Class<?>, boolean) throws androidx.appsearch.exceptions.AppSearchException;
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setDocumentClassVisibilityForPackage(Class<?>, boolean, androidx.appsearch.app.PackageIdentifier) throws androidx.appsearch.exceptions.AppSearchException;
     method public androidx.appsearch.app.SetSchemaRequest.Builder setForceOverride(boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrator(String, androidx.appsearch.app.Migrator);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setMigrators(java.util.Map<java.lang.String!,androidx.appsearch.app.Migrator!>);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeDisplayedBySystem(String, boolean);
     method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForPackage(String, boolean, androidx.appsearch.app.PackageIdentifier);
-    method public androidx.appsearch.app.SetSchemaRequest.Builder setSchemaTypeVisibilityForSystemUi(String, boolean);
+    method public androidx.appsearch.app.SetSchemaRequest.Builder setVersion(@IntRange(from=1) int);
+  }
+
+  public class SetSchemaResponse {
+    method public java.util.Set<java.lang.String!> getDeletedTypes();
+    method public java.util.Set<java.lang.String!> getIncompatibleTypes();
+    method public java.util.Set<java.lang.String!> getMigratedTypes();
+    method public java.util.List<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!> getMigrationFailures();
+  }
+
+  public static final class SetSchemaResponse.Builder {
+    ctor public SetSchemaResponse.Builder();
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addDeletedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addIncompatibleTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedType(String);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigratedTypes(java.util.Collection<java.lang.String!>);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailure(androidx.appsearch.app.SetSchemaResponse.MigrationFailure);
+    method public androidx.appsearch.app.SetSchemaResponse.Builder addMigrationFailures(java.util.Collection<androidx.appsearch.app.SetSchemaResponse.MigrationFailure!>);
+    method public androidx.appsearch.app.SetSchemaResponse build();
+  }
+
+  public static class SetSchemaResponse.MigrationFailure {
+    ctor public SetSchemaResponse.MigrationFailure(String, String, String, androidx.appsearch.app.AppSearchResult<?>);
+    method public androidx.appsearch.app.AppSearchResult<java.lang.Void!> getAppSearchResult();
+    method public String getDocumentId();
+    method public String getNamespace();
+    method public String getSchemaType();
+  }
+
+  public class StorageInfo {
+    method public int getAliveDocumentsCount();
+    method public int getAliveNamespacesCount();
+    method public long getSizeBytes();
+  }
+
+  public static final class StorageInfo.Builder {
+    ctor public StorageInfo.Builder();
+    method public androidx.appsearch.app.StorageInfo build();
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveDocumentsCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setAliveNamespacesCount(int);
+    method public androidx.appsearch.app.StorageInfo.Builder setSizeBytes(long);
   }
 
 }
@@ -298,6 +511,9 @@
 package androidx.appsearch.exceptions {
 
   public class AppSearchException extends java.lang.Exception {
+    ctor public AppSearchException(int);
+    ctor public AppSearchException(int, String?);
+    ctor public AppSearchException(int, String?, Throwable?);
     method public int getResultCode();
     method public <T> androidx.appsearch.app.AppSearchResult<T!> toAppSearchResult();
   }

diff --git a/appsearch/appsearch/build.gradle b/appsearch/appsearch/build.gradle
index 5760570..8b666c0 100644
--- a/appsearch/appsearch/build.gradle
+++ b/appsearch/appsearch/build.gradle

@@ -28,16 +28,21 @@
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+    buildTypes.all {
+        consumerProguardFiles "proguard-rules.pro"
+    }
 }
 
 dependencies {
     api('androidx.annotation:annotation:1.1.0')
+    api(libs.jsr250)
 
     implementation('androidx.concurrent:concurrent-futures:1.0.0')
     implementation('androidx.core:core:1.2.0')
 
     androidTestAnnotationProcessor project(':appsearch:appsearch-compiler')
     androidTestImplementation project(':appsearch:appsearch-local-storage')
+    androidTestImplementation project(':appsearch:appsearch-platform-storage')
     androidTestImplementation(libs.testCore)
     androidTestImplementation(libs.testRules)
     androidTestImplementation(libs.truth)

diff --git a/appsearch/appsearch/proguard-rules.pro b/appsearch/appsearch/proguard-rules.pro
new file mode 100644
index 0000000..a7af3cc
--- /dev/null
+++ b/appsearch/appsearch/proguard-rules.pro

@@ -0,0 +1,16 @@
+#  Copyright (C) 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.
+-keep class ** implements androidx.appsearch.app.DocumentClassFactory { *; }
+
+-keep @androidx.appsearch.annotation.Document class *

diff --git a/appsearch/appsearch/src/androidTest/AndroidManifest.xml b/appsearch/appsearch/src/androidTest/AndroidManifest.xml
index 563502a..c2e7297 100644
--- a/appsearch/appsearch/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch/src/androidTest/AndroidManifest.xml

@@ -16,4 +16,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="androidx.appsearch.test">
+    <!-- Required for junit TemporaryFolder rule on older API levels -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorLocalTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorLocalTest.java
index 808d90e..b22f8d8 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorLocalTest.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorLocalTest.java

@@ -29,6 +29,6 @@
     protected ListenableFuture<AppSearchSession> createSearchSession(@NonNull String dbName) {
         Context context = ApplicationProvider.getApplicationContext();
         return LocalStorage.createSearchSession(
-                new LocalStorage.SearchContext.Builder(context).setDatabaseName(dbName).build());
+                new LocalStorage.SearchContext.Builder(context, dbName).build());
     }
 }

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorPlatformTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorPlatformTest.java
new file mode 100644
index 0000000..5dbb8a2
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorPlatformTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 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:skipFile()
+package androidx.appsearch.app;
+
+import android.content.Context;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.appsearch.platformstorage.PlatformStorage;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SdkSuppress;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+public class AnnotationProcessorPlatformTest extends AnnotationProcessorTestBase {
+    @Override
+    protected ListenableFuture<AppSearchSession> createSearchSession(@NonNull String dbName) {
+        Context context = ApplicationProvider.getApplicationContext();
+        return PlatformStorage.createSearchSession(
+                new PlatformStorage.SearchContext.Builder(context, dbName).build());
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorTestBase.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorTestBase.java
index 58b80b0..012565b 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorTestBase.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AnnotationProcessorTestBase.java

@@ -16,16 +16,16 @@
 // @exportToFramework:skipFile()
 package androidx.appsearch.app;
 
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_PREFIXES;
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
+import static androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES;
+import static androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN;
 import static androidx.appsearch.app.util.AppSearchTestUtils.checkIsBatchResultSuccess;
 import static androidx.appsearch.app.util.AppSearchTestUtils.convertSearchResultsToDocuments;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import androidx.annotation.NonNull;
-import androidx.appsearch.annotation.AppSearchDocument;
-import androidx.appsearch.localstorage.LocalStorage;
+import androidx.appsearch.annotation.Document;
+import androidx.appsearch.app.util.AppSearchEmail;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -39,7 +39,7 @@
 
 public abstract class AnnotationProcessorTestBase {
     private AppSearchSession mSession;
-    private static final String DB_NAME_1 = LocalStorage.DEFAULT_DATABASE_NAME;
+    private static final String DB_NAME_1 = "";
 
     protected abstract ListenableFuture<AppSearchSession> createSearchSession(
             @NonNull String dbName);
@@ -63,11 +63,18 @@
         mSession.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
     }
 
-    @AppSearchDocument
+    @Document
     static class Card {
-        @AppSearchDocument.Uri
-        String mUri;
-        @AppSearchDocument.Property
+        @Document.Namespace
+        String mNamespace;
+
+        @Document.Id
+        String mId;
+
+        @Document.CreationTimestampMillis
+        long mCreationTimestampMillis;
+
+        @Document.StringProperty
                 (indexingType = INDEXING_TYPE_PREFIXES, tokenizerType = TOKENIZER_TYPE_PLAIN)
         String mString;        // 3a
 
@@ -80,90 +87,96 @@
                 return false;
             }
             Card otherCard = (Card) other;
-            assertThat(otherCard.mUri).isEqualTo(this.mUri);
+            assertThat(otherCard.mId).isEqualTo(this.mId);
             return true;
         }
     }
 
-    @AppSearchDocument
+    @Document
     static class Gift {
-        @AppSearchDocument.Uri
-        String mUri;
+        @Document.Namespace
+        String mNamespace;
+
+        @Document.Id
+        String mId;
+
+        @Document.CreationTimestampMillis
+        long mCreationTimestampMillis;
 
         // Collections
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Collection<Long> mCollectLong;         // 1a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Collection<Integer> mCollectInteger;   // 1a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Collection<Double> mCollectDouble;     // 1a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Collection<Float> mCollectFloat;       // 1a
-        @AppSearchDocument.Property
+        @Document.BooleanProperty
         Collection<Boolean> mCollectBoolean;   // 1a
-        @AppSearchDocument.Property
+        @Document.BytesProperty
         Collection<byte[]> mCollectByteArr;    // 1a
-        @AppSearchDocument.Property
+        @Document.StringProperty
         Collection<String> mCollectString;     // 1b
-        @AppSearchDocument.Property
+        @Document.DocumentProperty
         Collection<Card> mCollectCard;         // 1c
 
         // Arrays
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Long[] mArrBoxLong;         // 2a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         long[] mArrUnboxLong;       // 2b
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Integer[] mArrBoxInteger;   // 2a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         int[] mArrUnboxInt;         // 2a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Double[] mArrBoxDouble;     // 2a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         double[] mArrUnboxDouble;   // 2b
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Float[] mArrBoxFloat;       // 2a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         float[] mArrUnboxFloat;     // 2a
-        @AppSearchDocument.Property
+        @Document.BooleanProperty
         Boolean[] mArrBoxBoolean;   // 2a
-        @AppSearchDocument.Property
+        @Document.BooleanProperty
         boolean[] mArrUnboxBoolean; // 2b
-        @AppSearchDocument.Property
+        @Document.BytesProperty
         byte[][] mArrUnboxByteArr;  // 2b
-        @AppSearchDocument.Property
+        @Document.BytesProperty
         Byte[] mBoxByteArr;         // 2a
-        @AppSearchDocument.Property
+        @Document.StringProperty
         String[] mArrString;        // 2b
-        @AppSearchDocument.Property
+        @Document.DocumentProperty
         Card[] mArrCard;            // 2c
 
         // Single values
-        @AppSearchDocument.Property
+        @Document.StringProperty
         String mString;        // 3a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Long mBoxLong;         // 3a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         long mUnboxLong;       // 3b
-        @AppSearchDocument.Property
+        @Document.LongProperty
         Integer mBoxInteger;   // 3a
-        @AppSearchDocument.Property
+        @Document.LongProperty
         int mUnboxInt;         // 3b
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Double mBoxDouble;     // 3a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         double mUnboxDouble;   // 3b
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         Float mBoxFloat;       // 3a
-        @AppSearchDocument.Property
+        @Document.DoubleProperty
         float mUnboxFloat;     // 3b
-        @AppSearchDocument.Property
+        @Document.BooleanProperty
         Boolean mBoxBoolean;   // 3a
-        @AppSearchDocument.Property
+        @Document.BooleanProperty
         boolean mUnboxBoolean; // 3b
-        @AppSearchDocument.Property
+        @Document.BytesProperty
         byte[] mUnboxByteArr;  // 3a
-        @AppSearchDocument.Property
+        @Document.DocumentProperty
         Card mCard;            // 3c
 
         @Override
@@ -175,7 +188,8 @@
                 return false;
             }
             Gift otherGift = (Gift) other;
-            assertThat(otherGift.mUri).isEqualTo(this.mUri);
+            assertThat(otherGift.mNamespace).isEqualTo(this.mNamespace);
+            assertThat(otherGift.mId).isEqualTo(this.mId);
             assertThat(otherGift.mArrBoxBoolean).isEqualTo(this.mArrBoxBoolean);
             assertThat(otherGift.mArrBoxDouble).isEqualTo(this.mArrBoxDouble);
             assertThat(otherGift.mArrBoxFloat).isEqualTo(this.mArrBoxFloat);
@@ -224,132 +238,152 @@
             assertThat(second).isNotNull();
             assertThat(first.toArray()).isEqualTo(second.toArray());
         }
+
+        public static Gift createPopulatedGift() {
+            Gift gift = new Gift();
+            gift.mNamespace = "gift.namespace";
+            gift.mId = "gift.id";
+
+            gift.mArrBoxBoolean = new Boolean[]{true, false};
+            gift.mArrBoxDouble = new Double[]{0.0, 1.0};
+            gift.mArrBoxFloat = new Float[]{2.0F, 3.0F};
+            gift.mArrBoxInteger = new Integer[]{4, 5};
+            gift.mArrBoxLong = new Long[]{6L, 7L};
+            gift.mArrString = new String[]{"cat", "dog"};
+            gift.mBoxByteArr = new Byte[]{8, 9};
+            gift.mArrUnboxBoolean = new boolean[]{false, true};
+            gift.mArrUnboxByteArr = new byte[][]{{0, 1}, {2, 3}};
+            gift.mArrUnboxDouble = new double[]{1.0, 0.0};
+            gift.mArrUnboxFloat = new float[]{3.0f, 2.0f};
+            gift.mArrUnboxInt = new int[]{5, 4};
+            gift.mArrUnboxLong = new long[]{7, 6};
+
+            Card card1 = new Card();
+            card1.mNamespace = "card.namespace";
+            card1.mId = "card.id1";
+            Card card2 = new Card();
+            card2.mNamespace = "card.namespace";
+            card2.mId = "card.id2";
+            gift.mArrCard = new Card[]{card2, card2};
+
+            gift.mCollectLong = Arrays.asList(gift.mArrBoxLong);
+            gift.mCollectInteger = Arrays.asList(gift.mArrBoxInteger);
+            gift.mCollectBoolean = Arrays.asList(gift.mArrBoxBoolean);
+            gift.mCollectString = Arrays.asList(gift.mArrString);
+            gift.mCollectDouble = Arrays.asList(gift.mArrBoxDouble);
+            gift.mCollectFloat = Arrays.asList(gift.mArrBoxFloat);
+            gift.mCollectByteArr = Arrays.asList(gift.mArrUnboxByteArr);
+            gift.mCollectCard = Arrays.asList(card2, card2);
+
+            gift.mString = "String";
+            gift.mBoxLong = 1L;
+            gift.mUnboxLong = 2L;
+            gift.mBoxInteger = 3;
+            gift.mUnboxInt = 4;
+            gift.mBoxDouble = 5.0;
+            gift.mUnboxDouble = 6.0;
+            gift.mBoxFloat = 7.0F;
+            gift.mUnboxFloat = 8.0f;
+            gift.mBoxBoolean = true;
+            gift.mUnboxBoolean = false;
+            gift.mUnboxByteArr = new byte[]{1, 2, 3};
+            gift.mCard = card1;
+
+            return gift;
+        }
     }
 
     @Test
     public void testAnnotationProcessor() throws Exception {
         //TODO(b/156296904) add test for int, float, GenericDocument, and class with
-        // @AppSearchDocument annotation
+        // @Document annotation
         mSession.setSchema(
-                new SetSchemaRequest.Builder().addDataClass(Card.class, Gift.class).build()).get();
+                new SetSchemaRequest.Builder().addDocumentClasses(Card.class, Gift.class).build())
+                .get();
 
         // Create a Gift object and assign values.
-        Gift inputDataClass = new Gift();
-        inputDataClass.mUri = "gift.uri";
-
-        inputDataClass.mArrBoxBoolean = new Boolean[]{true, false};
-        inputDataClass.mArrBoxDouble = new Double[]{0.0, 1.0};
-        inputDataClass.mArrBoxFloat = new Float[]{2.0F, 3.0F};
-        inputDataClass.mArrBoxInteger = new Integer[]{4, 5};
-        inputDataClass.mArrBoxLong = new Long[]{6L, 7L};
-        inputDataClass.mArrString = new String[]{"cat", "dog"};
-        inputDataClass.mBoxByteArr = new Byte[]{8, 9};
-        inputDataClass.mArrUnboxBoolean = new boolean[]{false, true};
-        inputDataClass.mArrUnboxByteArr = new byte[][]{{0, 1}, {2, 3}};
-        inputDataClass.mArrUnboxDouble = new double[]{1.0, 0.0};
-        inputDataClass.mArrUnboxFloat = new float[]{3.0f, 2.0f};
-        inputDataClass.mArrUnboxInt = new int[]{5, 4};
-        inputDataClass.mArrUnboxLong = new long[]{7, 6};
-
-        Card card1 = new Card();
-        card1.mUri = "card.uri1";
-        Card card2 = new Card();
-        card2.mUri = "card.uri2";
-        inputDataClass.mArrCard = new Card[]{card2, card2};
-
-        inputDataClass.mCollectLong = Arrays.asList(inputDataClass.mArrBoxLong);
-        inputDataClass.mCollectInteger = Arrays.asList(inputDataClass.mArrBoxInteger);
-        inputDataClass.mCollectBoolean = Arrays.asList(inputDataClass.mArrBoxBoolean);
-        inputDataClass.mCollectString = Arrays.asList(inputDataClass.mArrString);
-        inputDataClass.mCollectDouble = Arrays.asList(inputDataClass.mArrBoxDouble);
-        inputDataClass.mCollectFloat = Arrays.asList(inputDataClass.mArrBoxFloat);
-        inputDataClass.mCollectByteArr = Arrays.asList(inputDataClass.mArrUnboxByteArr);
-        inputDataClass.mCollectCard = Arrays.asList(card2, card2);
-
-        inputDataClass.mString = "String";
-        inputDataClass.mBoxLong = 1L;
-        inputDataClass.mUnboxLong = 2L;
-        inputDataClass.mBoxInteger = 3;
-        inputDataClass.mUnboxInt = 4;
-        inputDataClass.mBoxDouble = 5.0;
-        inputDataClass.mUnboxDouble = 6.0;
-        inputDataClass.mBoxFloat = 7.0F;
-        inputDataClass.mUnboxFloat = 8.0f;
-        inputDataClass.mBoxBoolean = true;
-        inputDataClass.mUnboxBoolean = false;
-        inputDataClass.mUnboxByteArr = new byte[]{1, 2, 3};
-        inputDataClass.mCard = card1;
+        Gift inputDocument = Gift.createPopulatedGift();
 
         // Index the Gift document and query it.
-        checkIsBatchResultSuccess(mSession.putDocuments(
-                new PutDocumentsRequest.Builder().addDataClass(inputDataClass).build()));
-        SearchResults searchResults = mSession.query("", new SearchSpec.Builder()
+        checkIsBatchResultSuccess(mSession.put(
+                new PutDocumentsRequest.Builder().addDocuments(inputDocument).build()));
+        SearchResults searchResults = mSession.search("", new SearchSpec.Builder()
                 .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
                 .build());
         List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(1);
 
-        // Create DataClassFactory for Gift.
-        DataClassFactoryRegistry registry = DataClassFactoryRegistry.getInstance();
-        DataClassFactory<Gift> factory = registry.getOrCreateFactory(Gift.class);
-
         // Convert GenericDocument to Gift and check values.
-        Gift outputDataClass = factory.fromGenericDocument(documents.get((0)));
-        assertThat(outputDataClass).isEqualTo(inputDataClass);
+        Gift outputDocument = documents.get(0).toDocumentClass(Gift.class);
+        assertThat(outputDocument).isEqualTo(inputDocument);
     }
 
     @Test
     public void testAnnotationProcessor_queryByType() throws Exception {
         mSession.setSchema(
                 new SetSchemaRequest.Builder()
-                        .addDataClass(Card.class, Gift.class)
-                        .addSchema(AppSearchEmail.SCHEMA).build())
+                        .addDocumentClasses(Card.class, Gift.class)
+                        .addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Create documents and index them
-        Gift inputDataClass1 = new Gift();
-        inputDataClass1.mUri = "gift.uri1";
-        Gift inputDataClass2 = new Gift();
-        inputDataClass2.mUri = "gift.uri2";
+        Gift inputDocument1 = new Gift();
+        inputDocument1.mNamespace = "gift.namespace";
+        inputDocument1.mId = "gift.id1";
+        Gift inputDocument2 = new Gift();
+        inputDocument2.mNamespace = "gift.namespace";
+        inputDocument2.mId = "gift.id2";
         AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri3")
-                        .setNamespace("namespace")
+                new AppSearchEmail.Builder("namespace", "id3")
                         .setFrom("from@example.com")
                         .setTo("to1@example.com", "to2@example.com")
                         .setSubject("testPut example")
                         .setBody("This is the body of the testPut email")
                         .build();
-        checkIsBatchResultSuccess(mSession.putDocuments(
+        checkIsBatchResultSuccess(mSession.put(
                 new PutDocumentsRequest.Builder()
-                        .addDataClass(inputDataClass1, inputDataClass2)
-                        .addGenericDocument(email1).build()));
+                        .addDocuments(inputDocument1, inputDocument2)
+                        .addGenericDocuments(email1).build()));
 
         // Query the documents by it's schema type.
-        SearchResults searchResults = mSession.query("",
+        SearchResults searchResults = mSession.search("",
                 new SearchSpec.Builder()
                         .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addSchemaType("Gift", AppSearchEmail.SCHEMA_TYPE)
+                        .addFilterSchemas("Gift", AppSearchEmail.SCHEMA_TYPE)
                         .build());
         List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(3);
 
         // Query the documents by it's class.
-        searchResults = mSession.query("",
+        searchResults = mSession.search("",
                 new SearchSpec.Builder()
                         .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addSchemaByDataClass(Gift.class)
+                        .addFilterDocumentClasses(Gift.class)
                         .build());
         documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(2);
 
         // Query the documents by schema type and class mix.
-        searchResults = mSession.query("",
+        searchResults = mSession.search("",
                 new SearchSpec.Builder()
                         .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addSchemaType(AppSearchEmail.SCHEMA_TYPE)
-                        .addSchemaByDataClass(Gift.class)
+                        .addFilterSchemas(AppSearchEmail.SCHEMA_TYPE)
+                        .addFilterDocumentClasses(Gift.class)
                         .build());
         documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(3);
     }
+
+    @Test
+    public void testGenericDocumentConversion() throws Exception {
+        Gift inGift = Gift.createPopulatedGift();
+        GenericDocument genericDocument1 = GenericDocument.fromDocumentClass(inGift);
+        GenericDocument genericDocument2 = GenericDocument.fromDocumentClass(inGift);
+        Gift outGift = genericDocument2.toDocumentClass(Gift.class);
+
+        assertThat(inGift).isNotSameInstanceAs(outGift);
+        assertThat(inGift).isEqualTo(outGift);
+        assertThat(genericDocument1).isNotSameInstanceAs(genericDocument2);
+        assertThat(genericDocument1).isEqualTo(genericDocument2);
+    }
 }

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchEmailTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchEmailTest.java
index ee68c88..ef88e46 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchEmailTest.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchEmailTest.java

@@ -18,13 +18,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.appsearch.app.util.AppSearchEmail;
+
 import org.junit.Test;
 
 public class AppSearchEmailTest {
 
     @Test
     public void testBuildEmailAndGetValue() {
-        AppSearchEmail email = new AppSearchEmail.Builder("uri")
+        AppSearchEmail email = new AppSearchEmail.Builder("namespace", "id")
                 .setFrom("FakeFromAddress")
                 .setCc("CC1", "CC2")
                 // Score and Property are mixed into the middle to make sure DocumentBuilder's
@@ -35,7 +37,8 @@
                 .setBody("EmailBody")
                 .build();
 
-        assertThat(email.getUri()).isEqualTo("uri");
+        assertThat(email.getNamespace()).isEqualTo("namespace");
+        assertThat(email.getId()).isEqualTo("id");
         assertThat(email.getFrom()).isEqualTo("FakeFromAddress");
         assertThat(email.getTo()).isNull();
         assertThat(email.getCc()).asList().containsExactly("CC1", "CC2");

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchResultTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchResultTest.java
new file mode 100644
index 0000000..125e55f
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/AppSearchResultTest.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 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.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+
+public class AppSearchResultTest {
+    @Test
+    public void testMapNullPointerException() {
+        NullPointerException e = assertThrows(NullPointerException.class, () -> {
+            Object o = null;
+            o.toString();
+        });
+        AppSearchResult<?> result = AppSearchResult.throwableToFailedResult(e);
+        assertThat(result.getResultCode()).isEqualTo(AppSearchResult.RESULT_INTERNAL_ERROR);
+        // Makes sure the exception name is included in the string. Some exceptions have terse or
+        // missing strings so it's confusing to read the output without the exception name.
+        assertThat(result.getErrorMessage()).startsWith("NullPointerException");
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/GenericDocumentTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/GenericDocumentTest.java
new file mode 100644
index 0000000..c15f290
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/GenericDocumentTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2020 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.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import org.junit.Test;
+
+public class GenericDocumentTest {
+    @Test
+    public void testRecreateFromParcel() {
+        GenericDocument inDoc = new GenericDocument.Builder<>("namespace", "id1", "schema1")
+                .setScore(42)
+                .setPropertyString("propString", "Hello")
+                .setPropertyBytes("propBytes", new byte[][]{{1, 2}})
+                .setPropertyDocument(
+                        "propDocument",
+                        new GenericDocument.Builder<>("namespace", "id2", "schema2")
+                                .setPropertyString("propString", "Goodbye")
+                                .setPropertyBytes("propBytes", new byte[][]{{3, 4}})
+                                .build())
+                .build();
+
+        // Serialize the document
+        Parcel inParcel = Parcel.obtain();
+        inParcel.writeBundle(inDoc.getBundle());
+        byte[] data = inParcel.marshall();
+        inParcel.recycle();
+
+        // Deserialize the document
+        Parcel outParcel = Parcel.obtain();
+        outParcel.unmarshall(data, 0, data.length);
+        outParcel.setDataPosition(0);
+        Bundle outBundle = outParcel.readBundle();
+        outParcel.recycle();
+
+        // Compare results
+        GenericDocument outDoc = new GenericDocument(outBundle);
+        assertThat(inDoc).isEqualTo(outDoc);
+        assertThat(outDoc.getPropertyString("propString")).isEqualTo("Hello");
+        assertThat(outDoc.getPropertyBytesArray("propBytes")).isEqualTo(new byte[][]{{1, 2}});
+        assertThat(outDoc.getPropertyDocument("propDocument").getPropertyString("propString"))
+                .isEqualTo("Goodbye");
+        assertThat(outDoc.getPropertyDocument("propDocument").getPropertyBytesArray("propBytes"))
+                .isEqualTo(new byte[][]{{3, 4}});
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/PutDocumentsRequestTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/PutDocumentsRequestTest.java
deleted file mode 100644
index bd61231..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/PutDocumentsRequestTest.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*
- * Copyright 2020 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.app;
-
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_PREFIXES;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.appsearch.annotation.AppSearchDocument;
-import androidx.appsearch.localstorage.LocalStorage;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.google.common.collect.ImmutableSet;
-
-import org.junit.Test;
-
-import java.util.Set;
-
-public class PutDocumentsRequestTest {
-
-    @Test
-    public void addGenericDocument_byCollection() {
-        Set<AppSearchEmail> emails = ImmutableSet.of(new AppSearchEmail.Builder("test1").build(),
-                new AppSearchEmail.Builder("test2").build());
-        PutDocumentsRequest request = new PutDocumentsRequest.Builder().addGenericDocument(emails)
-                .build();
-
-        assertThat(request.getDocuments().get(0).getUri()).isEqualTo("test1");
-        assertThat(request.getDocuments().get(1).getUri()).isEqualTo("test2");
-    }
-
-// @exportToFramework:startStrip()
-    @AppSearchDocument
-    static class Card {
-        @AppSearchDocument.Uri
-        String mUri;
-
-        @AppSearchDocument.Property(indexingType = INDEXING_TYPE_PREFIXES)
-        String mString;
-
-        Card(String mUri, String mString) {
-            this.mUri = mUri;
-            this.mString = mString;
-        }
-    }
-
-    @Test
-    public void addDataClass_byCollection() throws Exception {
-        // A schema with Card must be set in order to be able to add a Card instance to
-        // PutDocumentsRequest.
-        Context context = ApplicationProvider.getApplicationContext();
-        AppSearchSession session = LocalStorage.createSearchSession(
-                new LocalStorage.SearchContext.Builder(context)
-                        .setDatabaseName(LocalStorage.DEFAULT_DATABASE_NAME)
-                        .build()
-        ).get();
-        session.setSchema(new SetSchemaRequest.Builder().addDataClass(Card.class).build()).get();
-
-        Set<Card> cards = ImmutableSet.of(new Card("cardUri", "cardProperty"));
-        PutDocumentsRequest request = new PutDocumentsRequest.Builder().addDataClass(cards)
-                .build();
-
-        assertThat(request.getDocuments().get(0).getUri()).isEqualTo("cardUri");
-    }
-// @exportToFramework:endStrip()
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SearchSpecTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SearchSpecTest.java
index 5d98ead..19ccc63 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SearchSpecTest.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SearchSpecTest.java

@@ -16,31 +16,21 @@
 
 package androidx.appsearch.app;
 
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_PREFIXES;
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Bundle;
 
-import androidx.appsearch.annotation.AppSearchDocument;
-
-import com.google.common.collect.ImmutableSet;
-
 import org.junit.Test;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 public class SearchSpecTest {
 
     @Test
     public void testGetBundle() {
         SearchSpec searchSpec = new SearchSpec.Builder()
                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                .addNamespace("namespace1", "namespace2")
-                .addSchemaType("schemaTypes1", "schemaTypes2")
+                .addFilterNamespaces("namespace1", "namespace2")
+                .addFilterSchemas("schemaTypes1", "schemaTypes2")
+                .addFilterPackageNames("package1", "package2")
                 .setSnippetCount(5)
                 .setSnippetCountPerProperty(10)
                 .setMaxSnippetSize(15)
@@ -54,8 +44,10 @@
                 .isEqualTo(SearchSpec.TERM_MATCH_PREFIX);
         assertThat(bundle.getStringArrayList(SearchSpec.NAMESPACE_FIELD)).containsExactly(
                 "namespace1", "namespace2");
-        assertThat(bundle.getStringArrayList(SearchSpec.SCHEMA_TYPE_FIELD)).containsExactly(
+        assertThat(bundle.getStringArrayList(SearchSpec.SCHEMA_FIELD)).containsExactly(
                 "schemaTypes1", "schemaTypes2");
+        assertThat(bundle.getStringArrayList(SearchSpec.PACKAGE_NAME_FIELD)).containsExactly(
+                "package1", "package2");
         assertThat(bundle.getInt(SearchSpec.SNIPPET_COUNT_FIELD)).isEqualTo(5);
         assertThat(bundle.getInt(SearchSpec.SNIPPET_COUNT_PER_PROPERTY_FIELD)).isEqualTo(10);
         assertThat(bundle.getInt(SearchSpec.MAX_SNIPPET_FIELD)).isEqualTo(15);
@@ -64,58 +56,4 @@
         assertThat(bundle.getInt(SearchSpec.RANKING_STRATEGY_FIELD))
                 .isEqualTo(SearchSpec.RANKING_STRATEGY_DOCUMENT_SCORE);
     }
-
-    @Test
-    public void testGetProjectionTypePropertyMasks() {
-        SearchSpec searchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                .addProjection("TypeA", "field1", "field2.subfield2")
-                .addProjection("TypeB", "field7")
-                .addProjection("TypeC")
-                .build();
-
-        Map<String, List<String>> typePropertyPathMap = searchSpec.getProjections();
-        assertThat(typePropertyPathMap.keySet())
-                .containsExactly("TypeA", "TypeB", "TypeC");
-        assertThat(typePropertyPathMap.get("TypeA")).containsExactly("field1", "field2.subfield2");
-        assertThat(typePropertyPathMap.get("TypeB")).containsExactly("field7");
-        assertThat(typePropertyPathMap.get("TypeC")).isEmpty();
-    }
-
-    @Test
-    public void testGetRankingStrategy() {
-        SearchSpec searchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_RELEVANCE_SCORE)
-                .build();
-        assertThat(searchSpec.getRankingStrategy()).isEqualTo(
-                SearchSpec.RANKING_STRATEGY_RELEVANCE_SCORE);
-    }
-
-// @exportToFramework:startStrip()
-    @AppSearchDocument
-    static class King extends Card {
-        @AppSearchDocument.Uri
-        String mUri;
-
-        @AppSearchDocument.Property
-                (indexingType = INDEXING_TYPE_PREFIXES, tokenizerType = TOKENIZER_TYPE_PLAIN)
-        String mString;
-    }
-
-    static class Card {}
-
-    @Test
-    public void testAddSchemaByDataClass_byCollection() throws Exception {
-        Set<Class<King>> cardClassSet = ImmutableSet.of(King.class);
-        SearchSpec searchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                .addSchemaByDataClass(cardClassSet)
-                .build();
-
-        Bundle bundle = searchSpec.getBundle();
-        assertThat(bundle.getStringArrayList(SearchSpec.SCHEMA_TYPE_FIELD)).containsExactly(
-                "King");
-    }
-// @exportToFramework:endStrip()
 }

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaRequestTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaRequestTest.java
deleted file mode 100644
index 4b8b21d..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaRequestTest.java
+++ /dev/null

@@ -1,337 +0,0 @@
-/*
- * Copyright 2020 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.app;
-
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.INDEXING_TYPE_PREFIXES;
-import static androidx.appsearch.app.AppSearchSchema.PropertyConfig.TOKENIZER_TYPE_PLAIN;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import androidx.appsearch.annotation.AppSearchDocument;
-import androidx.collection.ArrayMap;
-
-import com.google.common.collect.ImmutableSet;
-
-import org.junit.Test;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class SetSchemaRequestTest {
-// @exportToFramework:startStrip()
-    @AppSearchDocument
-    static class Card {
-        @AppSearchDocument.Uri
-        String mUri;
-
-        @AppSearchDocument.Property
-                (indexingType = INDEXING_TYPE_PREFIXES, tokenizerType = TOKENIZER_TYPE_PLAIN)
-        String mString;
-
-        @Override
-        public boolean equals(Object other) {
-            if (this == other) {
-                return true;
-            }
-            if (!(other instanceof AnnotationProcessorTestBase.Card)) {
-                return false;
-            }
-            AnnotationProcessorTestBase.Card otherCard = (AnnotationProcessorTestBase.Card) other;
-            assertThat(otherCard.mUri).isEqualTo(this.mUri);
-            return true;
-        }
-    }
-
-    static class Spade {}
-
-    @AppSearchDocument
-    static class King extends Spade {
-        @AppSearchDocument.Uri
-        String mUri;
-
-        @AppSearchDocument.Property
-                (indexingType = INDEXING_TYPE_PREFIXES, tokenizerType = TOKENIZER_TYPE_PLAIN)
-        String mString;
-    }
-
-    @AppSearchDocument
-    static class Queen extends Spade {
-        @AppSearchDocument.Uri
-        String mUri;
-
-        @AppSearchDocument.Property
-                (indexingType = INDEXING_TYPE_PREFIXES, tokenizerType = TOKENIZER_TYPE_PLAIN)
-        String mString;
-    }
-// @exportToFramework:endStrip()
-
-    private static Collection<String> getSchemaTypesFromSetSchemaRequest(SetSchemaRequest request) {
-        HashSet<String> schemaTypes = new HashSet<>();
-        for (AppSearchSchema schema : request.getSchemas()) {
-            schemaTypes.add(schema.getSchemaType());
-        }
-        return schemaTypes;
-    }
-
-    @Test
-    public void testInvalidSchemaReferences_fromSystemUiVisibility() {
-        IllegalArgumentException expected = assertThrows(IllegalArgumentException.class,
-                () -> new SetSchemaRequest.Builder().setSchemaTypeVisibilityForSystemUi(
-                        "InvalidSchema", false).build());
-        assertThat(expected).hasMessageThat().contains("referenced, but were not added");
-    }
-
-    @Test
-    public void testInvalidSchemaReferences_fromPackageVisibility() {
-        IllegalArgumentException expected = assertThrows(IllegalArgumentException.class,
-                () -> new SetSchemaRequest.Builder().setSchemaTypeVisibilityForPackage(
-                        "InvalidSchema", /*visible=*/ true, new PackageIdentifier(
-                                "com.foo.package", /*sha256Certificate=*/ new byte[]{})).build());
-        assertThat(expected).hasMessageThat().contains("referenced, but were not added");
-    }
-
-    @Test
-    public void testSchemaTypeVisibilityForSystemUi_visible() {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-
-        // By default, the schema is visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addSchema(schema).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).isEmpty();
-
-        request =
-                new SetSchemaRequest.Builder().addSchema(schema).setSchemaTypeVisibilityForSystemUi(
-                        "Schema", true).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).isEmpty();
-    }
-
-    @Test
-    public void testSchemaTypeVisibilityForSystemUi_notVisible() {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addSchema(schema).setSchemaTypeVisibilityForSystemUi(
-                        "Schema", false).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).containsExactly("Schema");
-    }
-
-// @exportToFramework:startStrip()
-    @Test
-    public void testDataClassVisibilityForSystemUi_visible() throws Exception {
-        // By default, the schema is visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(Card.class).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).isEmpty();
-
-        request =
-                new SetSchemaRequest.Builder().addDataClass(
-                        Card.class).setDataClassVisibilityForSystemUi(
-                        Card.class, true).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).isEmpty();
-    }
-
-    @Test
-    public void testDataClassVisibilityForSystemUi_notVisible() throws Exception {
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(
-                        Card.class).setDataClassVisibilityForSystemUi(
-                        Card.class, false).build();
-        assertThat(request.getSchemasNotVisibleToSystemUi()).containsExactly("Card");
-    }
-// @exportToFramework:endStrip()
-
-    @Test
-    public void testSchemaTypeVisibilityForPackage_visible() {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-
-        // By default, the schema is not visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addSchema(schema).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-
-        PackageIdentifier packageIdentifier = new PackageIdentifier("com.package.foo",
-                new byte[]{100});
-        Map<String, Set<PackageIdentifier>> expectedVisibleToPackagesMap = new ArrayMap<>();
-        expectedVisibleToPackagesMap.put("Schema", Collections.singleton(packageIdentifier));
-
-        request =
-                new SetSchemaRequest.Builder().addSchema(schema).setSchemaTypeVisibilityForPackage(
-                        "Schema", /*visible=*/ true, packageIdentifier).build();
-        assertThat(request.getSchemasVisibleToPackages()).containsExactlyEntriesIn(
-                expectedVisibleToPackagesMap);
-    }
-
-    @Test
-    public void testSchemaTypeVisibilityForPackage_notVisible() {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addSchema(schema).setSchemaTypeVisibilityForPackage(
-                        "Schema", /*visible=*/ false, new PackageIdentifier("com.package.foo",
-                                /*sha256Certificate=*/ new byte[]{})).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-    }
-
-    @Test
-    public void testSchemaTypeVisibilityForPackage_deduped() throws Exception {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-
-        PackageIdentifier packageIdentifier = new PackageIdentifier("com.package.foo",
-                new byte[]{100});
-        Map<String, Set<PackageIdentifier>> expectedVisibleToPackagesMap = new ArrayMap<>();
-        expectedVisibleToPackagesMap.put("Schema", Collections.singleton(packageIdentifier));
-
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder()
-                        .addSchema(schema)
-                        // Set it visible for "Schema"
-                        .setSchemaTypeVisibilityForPackage("Schema", /*visible=*/
-                                true, packageIdentifier)
-                        // Set it visible for "Schema" again, which should be a no-op
-                        .setSchemaTypeVisibilityForPackage("Schema", /*visible=*/
-                                true, packageIdentifier)
-                        .build();
-        assertThat(request.getSchemasVisibleToPackages()).containsExactlyEntriesIn(
-                expectedVisibleToPackagesMap);
-    }
-
-    @Test
-    public void testSchemaTypeVisibilityForPackage_removed() throws Exception {
-        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
-
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder()
-                        .addSchema(schema)
-                        // First set it as visible
-                        .setSchemaTypeVisibilityForPackage("Schema", /*visible=*/
-                                true, new PackageIdentifier("com.package.foo",
-                                        /*sha256Certificate=*/ new byte[]{100}))
-                        // Then make it not visible
-                        .setSchemaTypeVisibilityForPackage("Schema", /*visible=*/
-                                false, new PackageIdentifier("com.package.foo",
-                                        /*sha256Certificate=*/ new byte[]{100}))
-                        .build();
-
-        // Nothing should be visible.
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-    }
-
-// @exportToFramework:startStrip()
-    @Test
-    public void testDataClassVisibilityForPackage_visible() throws Exception {
-        // By default, the schema is not visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(Card.class).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-
-        PackageIdentifier packageIdentifier = new PackageIdentifier("com.package.foo",
-                new byte[]{100});
-        Map<String, Set<PackageIdentifier>> expectedVisibleToPackagesMap = new ArrayMap<>();
-        expectedVisibleToPackagesMap.put("Card", Collections.singleton(packageIdentifier));
-
-        request =
-                new SetSchemaRequest.Builder().addDataClass(
-                        Card.class).setDataClassVisibilityForPackage(
-                        Card.class, /*visible=*/ true, packageIdentifier).build();
-        assertThat(request.getSchemasVisibleToPackages()).containsExactlyEntriesIn(
-                expectedVisibleToPackagesMap);
-    }
-
-    @Test
-    public void testDataClassVisibilityForPackage_notVisible() throws Exception {
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(
-                        Card.class).setDataClassVisibilityForPackage(
-                        Card.class, /*visible=*/ false,
-                        new PackageIdentifier("com.package.foo", /*sha256Certificate=*/
-                                new byte[]{})).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-    }
-
-    @Test
-    public void testDataClassVisibilityForPackage_deduped() throws Exception {
-        // By default, the schema is not visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(Card.class).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-
-        PackageIdentifier packageIdentifier = new PackageIdentifier("com.package.foo",
-                new byte[]{100});
-        Map<String, Set<PackageIdentifier>> expectedVisibleToPackagesMap = new ArrayMap<>();
-        expectedVisibleToPackagesMap.put("Card", Collections.singleton(packageIdentifier));
-
-        request =
-                new SetSchemaRequest.Builder()
-                        .addDataClass(Card.class)
-                        .setDataClassVisibilityForPackage(Card.class, /*visible=*/
-                                true, packageIdentifier)
-                        .setDataClassVisibilityForPackage(Card.class, /*visible=*/
-                                true, packageIdentifier)
-                        .build();
-        assertThat(request.getSchemasVisibleToPackages()).containsExactlyEntriesIn(
-                expectedVisibleToPackagesMap);
-    }
-
-    @Test
-    public void testDataClassVisibilityForPackage_removed() throws Exception {
-        // By default, the schema is not visible.
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(Card.class).build();
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-
-        request =
-                new SetSchemaRequest.Builder()
-                        .addDataClass(Card.class)
-                        // First set it as visible
-                        .setDataClassVisibilityForPackage(Card.class, /*visible=*/
-                                true, new PackageIdentifier("com.package.foo",
-                                        /*sha256Certificate=*/ new byte[]{100}))
-                        // Then make it not visible
-                        .setDataClassVisibilityForPackage(Card.class, /*visible=*/
-                                false, new PackageIdentifier("com.package.foo",
-                                        /*sha256Certificate=*/ new byte[]{100}))
-                        .build();
-
-        // Nothing should be visible.
-        assertThat(request.getSchemasVisibleToPackages()).isEmpty();
-    }
-
-    @Test
-    public void testAddDataClass_byCollection() throws Exception {
-        Set<Class<? extends Spade>> cardClasses = ImmutableSet.of(Queen.class, King.class);
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(cardClasses)
-                        .build();
-        assertThat(getSchemaTypesFromSetSchemaRequest(request)).containsExactly("Queen",
-                "King");
-    }
-
-    @Test
-    public void testAddDataClass_byCollectionWithSeparateCalls() throws
-            Exception {
-        SetSchemaRequest request =
-                new SetSchemaRequest.Builder().addDataClass(ImmutableSet.of(Queen.class))
-                        .addDataClass(ImmutableSet.of(King.class)).build();
-        assertThat(getSchemaTypesFromSetSchemaRequest(request)).containsExactly("Queen",
-                "King");
-    }
-// @exportToFramework:endStrip()
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaResponseTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaResponseTest.java
new file mode 100644
index 0000000..8aa6148
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/SetSchemaResponseTest.java

@@ -0,0 +1,69 @@
+/*
+ * 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.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
+public class SetSchemaResponseTest {
+    @Test
+    public void testRebuild() {
+        SetSchemaResponse.MigrationFailure failure1 = new SetSchemaResponse.MigrationFailure(
+                "namespace",
+                "failure1",
+                "schemaType",
+                AppSearchResult.newFailedResult(
+                        AppSearchResult.RESULT_INTERNAL_ERROR, "errorMessage"));
+        SetSchemaResponse.MigrationFailure failure2 = new SetSchemaResponse.MigrationFailure(
+                "namespace",
+                "failure2",
+                "schemaType",
+                AppSearchResult.newFailedResult(
+                        AppSearchResult.RESULT_INTERNAL_ERROR,  "errorMessage"));
+
+        SetSchemaResponse original = new SetSchemaResponse.Builder()
+                .addDeletedType("delete1")
+                .addIncompatibleType("incompatible1")
+                .addMigratedType("migrated1")
+                .addMigrationFailure(failure1)
+                .build();
+        assertThat(original.getDeletedTypes()).containsExactly("delete1");
+        assertThat(original.getIncompatibleTypes()).containsExactly("incompatible1");
+        assertThat(original.getMigratedTypes()).containsExactly("migrated1");
+        assertThat(original.getMigrationFailures()).containsExactly(failure1);
+
+        SetSchemaResponse rebuild = original.toBuilder()
+                        .addDeletedType("delete2")
+                        .addIncompatibleType("incompatible2")
+                        .addMigratedType("migrated2")
+                        .addMigrationFailure(failure2)
+                        .build();
+
+        // rebuild won't effect the original object
+        assertThat(original.getDeletedTypes()).containsExactly("delete1");
+        assertThat(original.getIncompatibleTypes()).containsExactly("incompatible1");
+        assertThat(original.getMigratedTypes()).containsExactly("migrated1");
+        assertThat(original.getMigrationFailures()).containsExactly(failure1);
+
+        assertThat(rebuild.getDeletedTypes()).containsExactly("delete1", "delete2");
+        assertThat(rebuild.getIncompatibleTypes()).containsExactly("incompatible1",
+                "incompatible2");
+        assertThat(rebuild.getMigratedTypes()).containsExactly("migrated1", "migrated2");
+        assertThat(rebuild.getMigrationFailures()).containsExactly(failure1, failure2);
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSchemaCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSchemaCtsTest.java
deleted file mode 100644
index 7a646b0..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSchemaCtsTest.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*
- * Copyright 2020 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.app.cts;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import androidx.appsearch.app.AppSearchSchema;
-import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
-import androidx.appsearch.exceptions.IllegalSchemaException;
-
-import org.junit.Test;
-
-public class AppSearchSchemaCtsTest {
-    @Test
-    public void testInvalidEnums() {
-        PropertyConfig.Builder builder = new PropertyConfig.Builder("test");
-        assertThrows(IllegalArgumentException.class, () -> builder.setDataType(99));
-        assertThrows(IllegalArgumentException.class, () -> builder.setCardinality(99));
-    }
-
-    @Test
-    public void testMissingFields() {
-        PropertyConfig.Builder builder = new PropertyConfig.Builder("test");
-        IllegalSchemaException e = assertThrows(IllegalSchemaException.class, builder::build);
-        assertThat(e).hasMessageThat().contains("Missing field: dataType");
-
-        builder.setDataType(PropertyConfig.DATA_TYPE_DOCUMENT);
-        e = assertThrows(IllegalSchemaException.class, builder::build);
-        assertThat(e).hasMessageThat().contains("Missing field: schemaType");
-
-        builder.setSchemaType("TestType");
-        e = assertThrows(IllegalSchemaException.class, builder::build);
-        assertThat(e).hasMessageThat().contains("Missing field: cardinality");
-
-        builder.setCardinality(PropertyConfig.CARDINALITY_REPEATED);
-        builder.build();
-    }
-
-    @Test
-    public void testDuplicateProperties() {
-        AppSearchSchema.Builder builder = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                );
-        IllegalSchemaException e = assertThrows(IllegalSchemaException.class,
-                () -> builder.addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()));
-        assertThat(e).hasMessageThat().contains("Property defined more than once: subject");
-    }
-
-    @Test
-    public void testEquals_identical() {
-        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        assertThat(schema1).isEqualTo(schema2);
-        assertThat(schema1.hashCode()).isEqualTo(schema2.hashCode());
-    }
-
-    @Test
-    public void testEquals_differentOrder() {
-        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .build()
-                ).build();
-        assertThat(schema1).isEqualTo(schema2);
-        assertThat(schema1.hashCode()).isEqualTo(schema2.hashCode());
-    }
-
-    @Test
-    public void testEquals_failure() {
-        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)  // Different
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        assertThat(schema1).isNotEqualTo(schema2);
-        assertThat(schema1.hashCode()).isNotEqualTo(schema2.hashCode());
-    }
-
-    @Test
-    public void testEquals_failure_differentOrder() {
-        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).addProperty(new PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        // Order of 'body' and 'subject' has been switched
-        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
-                .addProperty(new PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        assertThat(schema1).isNotEqualTo(schema2);
-        assertThat(schema1.hashCode()).isNotEqualTo(schema2.hashCode());
-    }
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSessionCtsTestBase.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSessionCtsTestBase.java
deleted file mode 100644
index b23a2a17..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchSessionCtsTestBase.java
+++ /dev/null

@@ -1,1851 +0,0 @@
-/*
- * Copyright 2020 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.app.cts;
-
-import static androidx.appsearch.app.util.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static androidx.appsearch.app.util.AppSearchTestUtils.convertSearchResultsToDocuments;
-import static androidx.appsearch.app.util.AppSearchTestUtils.doGet;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.appsearch.app.AppSearchBatchResult;
-import androidx.appsearch.app.AppSearchEmail;
-import androidx.appsearch.app.AppSearchResult;
-import androidx.appsearch.app.AppSearchSchema;
-import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
-import androidx.appsearch.app.AppSearchSession;
-import androidx.appsearch.app.GenericDocument;
-import androidx.appsearch.app.GetByUriRequest;
-import androidx.appsearch.app.PutDocumentsRequest;
-import androidx.appsearch.app.RemoveByUriRequest;
-import androidx.appsearch.app.SearchResult;
-import androidx.appsearch.app.SearchResults;
-import androidx.appsearch.app.SearchSpec;
-import androidx.appsearch.app.SetSchemaRequest;
-import androidx.appsearch.app.cts.customer.EmailDataClass;
-import androidx.appsearch.exceptions.AppSearchException;
-import androidx.appsearch.localstorage.LocalStorage;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-
-public abstract class AppSearchSessionCtsTestBase {
-    private AppSearchSession mDb1;
-    private static final String DB_NAME_1 = LocalStorage.DEFAULT_DATABASE_NAME;
-    private AppSearchSession mDb2;
-    private static final String DB_NAME_2 = "testDb2";
-
-    protected abstract ListenableFuture<AppSearchSession> createSearchSession(
-            @NonNull String dbName);
-
-    protected abstract ListenableFuture<AppSearchSession> createSearchSession(
-            @NonNull String dbName, @NonNull ExecutorService executor);
-
-    @Before
-    public void setUp() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
-
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        mDb2 = createSearchSession(DB_NAME_2).get();
-
-        // Cleanup whatever documents may still exist in these databases. This is needed in
-        // addition to tearDown in case a test exited without completing properly.
-        cleanup();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        // Cleanup whatever documents may still exist in these databases.
-        cleanup();
-    }
-
-    private void cleanup() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-    }
-
-    @Test
-    public void testSetSchema() throws Exception {
-        AppSearchSchema emailSchema = new AppSearchSchema.Builder("Email")
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).addProperty(new AppSearchSchema.PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(emailSchema).build()).get();
-    }
-
-// @exportToFramework:startStrip()
-
-    @Test
-    public void testSetSchema_dataClass() throws Exception {
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addDataClass(EmailDataClass.class).build()).get();
-    }
-// @exportToFramework:endStrip()
-
-// @exportToFramework:startStrip()
-
-    @Test
-    public void testGetSchema() throws Exception {
-        AppSearchSchema emailSchema1 = new AppSearchSchema.Builder("Email1")
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).addProperty(new AppSearchSchema.PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-        AppSearchSchema emailSchema2 = new AppSearchSchema.Builder("Email2")
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)  // Different
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).addProperty(new AppSearchSchema.PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)  // Different
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build()
-                ).build();
-
-        SetSchemaRequest request1 = new SetSchemaRequest.Builder()
-                .addSchema(emailSchema1).addDataClass(EmailDataClass.class).build();
-        SetSchemaRequest request2 = new SetSchemaRequest.Builder()
-                .addSchema(emailSchema2).addDataClass(EmailDataClass.class).build();
-
-        mDb1.setSchema(request1).get();
-        mDb2.setSchema(request2).get();
-
-        Set<AppSearchSchema> actual1 = mDb1.getSchema().get();
-        Set<AppSearchSchema> actual2 = mDb2.getSchema().get();
-
-        assertThat(actual1).isEqualTo(request1.getSchemas());
-        assertThat(actual2).isEqualTo(request2.getSchemas());
-    }
-// @exportToFramework:endStrip()
-
-    @Test
-    public void testPutDocuments() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index a document
-        AppSearchEmail email = new AppSearchEmail.Builder("uri1")
-                .setFrom("from@example.com")
-                .setTo("to1@example.com", "to2@example.com")
-                .setSubject("testPut example")
-                .setBody("This is the body of the testPut email")
-                .build();
-
-        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email).build()));
-        assertThat(result.getSuccesses()).containsExactly("uri1", null);
-        assertThat(result.getFailures()).isEmpty();
-    }
-
-// @exportToFramework:startStrip()
-
-    @Test
-    public void testPutDocuments_dataClass() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addDataClass(EmailDataClass.class).build()).get();
-
-        // Index a document
-        EmailDataClass email = new EmailDataClass();
-        email.uri = "uri1";
-        email.subject = "testPut example";
-        email.body = "This is the body of the testPut email";
-
-        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addDataClass(email).build()));
-        assertThat(result.getSuccesses()).containsExactly("uri1", null);
-        assertThat(result.getFailures()).isEmpty();
-    }
-// @exportToFramework:endStrip()
-
-    @Test
-    public void testUpdateSchema() throws Exception {
-        // Schema registration
-        AppSearchSchema oldEmailSchema = new AppSearchSchema.Builder(AppSearchEmail.SCHEMA_TYPE)
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build())
-                .build();
-        AppSearchSchema newEmailSchema = new AppSearchSchema.Builder(AppSearchEmail.SCHEMA_TYPE)
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build())
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("body")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build())
-                .build();
-        AppSearchSchema giftSchema = new AppSearchSchema.Builder("Gift")
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("price")
-                        .setDataType(PropertyConfig.DATA_TYPE_INT64)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_NONE)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_NONE)
-                        .build())
-                .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(oldEmailSchema).build()).get();
-
-        // Try to index a gift. This should fail as it's not in the schema.
-        GenericDocument gift =
-                new GenericDocument.Builder<>("gift1", "Gift").setPropertyLong("price", 5).build();
-        AppSearchBatchResult<String, Void> result =
-                mDb1.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(gift).build()).get();
-        assertThat(result.isSuccess()).isFalse();
-        assertThat(result.getFailures().get("gift1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Update the schema to include the gift and update email with a new field
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(newEmailSchema, giftSchema).build()).get();
-
-        // Try to index the document again, which should now work
-        checkIsBatchResultSuccess(
-                mDb1.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(gift).build()));
-
-        // Indexing an email with a body should also work
-        AppSearchEmail email = new AppSearchEmail.Builder("email1")
-                .setSubject("testPut example")
-                .setBody("This is the body of the testPut email")
-                .build();
-        checkIsBatchResultSuccess(
-                mDb1.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(email).build()));
-    }
-
-    @Test
-    public void testRemoveSchema() throws Exception {
-        // Schema registration
-        AppSearchSchema emailSchema = new AppSearchSchema.Builder(AppSearchEmail.SCHEMA_TYPE)
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build())
-                .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(emailSchema).build()).get();
-
-        // Index an email and check it present.
-        AppSearchEmail email = new AppSearchEmail.Builder("email1")
-                .setSubject("testPut example")
-                .build();
-        checkIsBatchResultSuccess(
-                mDb1.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(email).build()));
-        List<GenericDocument> outDocuments =
-                doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "email1");
-        assertThat(outDocuments).hasSize(1);
-        AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
-        assertThat(outEmail).isEqualTo(email);
-
-        // Try to remove the email schema. This should fail as it's an incompatible change.
-        Throwable failResult1 = assertThrows(
-                ExecutionException.class,
-                () -> mDb1.setSchema(new SetSchemaRequest.Builder().build()).get()).getCause();
-        assertThat(failResult1).isInstanceOf(AppSearchException.class);
-        assertThat(failResult1).hasMessageThat().contains("Schema is incompatible");
-        assertThat(failResult1).hasMessageThat().contains(
-                "Deleted types: [androidx.appsearch.test$" + DB_NAME_1 + "/builtin:Email]");
-
-        // Try to remove the email schema again, which should now work as we set forceOverride to
-        // be true.
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-
-        // Make sure the indexed email is gone.
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder()
-                        .setNamespace(GenericDocument.DEFAULT_NAMESPACE)
-                        .addUri("email1")
-                        .build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("email1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Try to index an email again. This should fail as the schema has been removed.
-        AppSearchEmail email2 = new AppSearchEmail.Builder("email2")
-                .setSubject("testPut example")
-                .build();
-        AppSearchBatchResult<String, Void> failResult2 = mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email2).build()).get();
-        assertThat(failResult2.isSuccess()).isFalse();
-        assertThat(failResult2.getFailures().get("email2").getErrorMessage())
-                .isEqualTo("Schema type config 'androidx.appsearch.test$" + DB_NAME_1
-                        + "/builtin:Email' not found");
-    }
-
-    @Test
-    public void testRemoveSchema_twoDatabases() throws Exception {
-        // Schema registration in mDb1 and mDb2
-        AppSearchSchema emailSchema = new AppSearchSchema.Builder(AppSearchEmail.SCHEMA_TYPE)
-                .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .build())
-                .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(emailSchema).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchema(emailSchema).build()).get();
-
-        // Index an email and check it present in database1.
-        AppSearchEmail email1 = new AppSearchEmail.Builder("email1")
-                .setSubject("testPut example")
-                .build();
-        checkIsBatchResultSuccess(
-                mDb1.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-        List<GenericDocument> outDocuments =
-                doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "email1");
-        assertThat(outDocuments).hasSize(1);
-        AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
-        assertThat(outEmail).isEqualTo(email1);
-
-        // Index an email and check it present in database2.
-        AppSearchEmail email2 = new AppSearchEmail.Builder("email2")
-                .setSubject("testPut example")
-                .build();
-        checkIsBatchResultSuccess(
-                mDb2.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(email2).build()));
-        outDocuments = doGet(mDb2, GenericDocument.DEFAULT_NAMESPACE, "email2");
-        assertThat(outDocuments).hasSize(1);
-        outEmail = new AppSearchEmail(outDocuments.get(0));
-        assertThat(outEmail).isEqualTo(email2);
-
-        // Try to remove the email schema in database1. This should fail as it's an incompatible
-        // change.
-        Throwable failResult1 = assertThrows(
-                ExecutionException.class,
-                () -> mDb1.setSchema(new SetSchemaRequest.Builder().build()).get()).getCause();
-        assertThat(failResult1).isInstanceOf(AppSearchException.class);
-        assertThat(failResult1).hasMessageThat().contains("Schema is incompatible");
-        assertThat(failResult1).hasMessageThat().contains(
-                "Deleted types: [androidx.appsearch.test$" + DB_NAME_1 + "/builtin:Email]");
-
-        // Try to remove the email schema again, which should now work as we set forceOverride to
-        // be true.
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-
-        // Make sure the indexed email is gone in database 1.
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().setNamespace(GenericDocument.DEFAULT_NAMESPACE)
-                        .addUri("email1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("email1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Try to index an email again. This should fail as the schema has been removed.
-        AppSearchEmail email3 = new AppSearchEmail.Builder("email3")
-                .setSubject("testPut example")
-                .build();
-        AppSearchBatchResult<String, Void> failResult2 = mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email3).build()).get();
-        assertThat(failResult2.isSuccess()).isFalse();
-        assertThat(failResult2.getFailures().get("email3").getErrorMessage())
-                .isEqualTo("Schema type config 'androidx.appsearch.test$" + DB_NAME_1
-                        + "/builtin:Email' not found");
-
-        // Make sure email in database 2 still present.
-        outDocuments = doGet(mDb2, GenericDocument.DEFAULT_NAMESPACE, "email2");
-        assertThat(outDocuments).hasSize(1);
-        outEmail = new AppSearchEmail(outDocuments.get(0));
-        assertThat(outEmail).isEqualTo(email2);
-
-        // Make sure email could still be indexed in database 2.
-        checkIsBatchResultSuccess(
-                mDb2.putDocuments(
-                        new PutDocumentsRequest.Builder().addGenericDocument(email2).build()));
-    }
-
-    @Test
-    public void testGetDocuments() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail).build()));
-
-        // Get the document
-        List<GenericDocument> outDocuments = doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1");
-        assertThat(outDocuments).hasSize(1);
-        AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
-        assertThat(outEmail).isEqualTo(inEmail);
-
-        // Can't get the document in the other instance.
-        AppSearchBatchResult<String, GenericDocument> failResult = mDb2.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(failResult.isSuccess()).isFalse();
-        assertThat(failResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-// @exportToFramework:startStrip()
-
-    @Test
-    public void testGetDocuments_dataClass() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addDataClass(EmailDataClass.class).build()).get();
-
-        // Index a document
-        EmailDataClass inEmail = new EmailDataClass();
-        inEmail.uri = "uri1";
-        inEmail.subject = "testPut example";
-        inEmail.body = "This is the body of the testPut inEmail";
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addDataClass(inEmail).build()));
-
-        // Get the document
-        List<GenericDocument> outDocuments = doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1");
-        assertThat(outDocuments).hasSize(1);
-        EmailDataClass outEmail = outDocuments.get(0).toDataClass(EmailDataClass.class);
-        assertThat(inEmail.uri).isEqualTo(outEmail.uri);
-        assertThat(inEmail.subject).isEqualTo(outEmail.subject);
-        assertThat(inEmail.body).isEqualTo(outEmail.body);
-    }
-// @exportToFramework:endStrip()
-
-    @Test
-    public void testQuery() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail).build()));
-
-        // Query for the document
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents.get(0)).isEqualTo(inEmail);
-
-        // Multi-term query
-        searchResults = mDb1.query("body email", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents.get(0)).isEqualTo(inEmail);
-    }
-
-    @Test
-    public void testQuery_getNextPage() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-        Set<AppSearchEmail> emailSet = new HashSet<>();
-        PutDocumentsRequest.Builder putDocumentsRequestBuilder = new PutDocumentsRequest.Builder();
-        // Index 31 documents
-        for (int i = 0; i < 31; i++) {
-            AppSearchEmail inEmail =
-                    new AppSearchEmail.Builder("uri" + i)
-                            .setFrom("from@example.com")
-                            .setTo("to1@example.com", "to2@example.com")
-                            .setSubject("testPut example")
-                            .setBody("This is the body of the testPut email")
-                            .build();
-            emailSet.add(inEmail);
-            putDocumentsRequestBuilder.addGenericDocument(inEmail);
-        }
-        checkIsBatchResultSuccess(mDb1.putDocuments(putDocumentsRequestBuilder.build()));
-
-        // Set number of results per page is 7.
-        SearchResults searchResults = mDb1.query("body",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .setResultCountPerPage(7)
-                        .build());
-        List<GenericDocument> documents = new ArrayList<>();
-
-        int pageNumber = 0;
-        List<SearchResult> results;
-
-        // keep loading next page until it's empty.
-        do {
-            results = searchResults.getNextPage().get();
-            ++pageNumber;
-            for (SearchResult result : results) {
-                documents.add(result.getDocument());
-            }
-        } while (results.size() > 0);
-
-        // check all document presents
-        assertThat(documents).containsExactlyElementsIn(emailSet);
-        assertThat(pageNumber).isEqualTo(6); // 5 (upper(31/7)) + 1 (final empty page)
-    }
-
-    @Test
-    public void testQuery_relevanceScoring() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-
-        // Index two documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("Mary had a little lamb")
-                        .setBody("A little lamb, little lamb")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("I'm a little teapot")
-                        .setBody("short and stout. Here is my handle, here is my spout.")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email1, email2).build()));
-
-        // Query for "little". It should match both emails.
-        SearchResults searchResults = mDb1.query("little", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_RELEVANCE_SCORE)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email1 should be ranked higher because 'little' appears three times in email1 and
-        // only once in email2.
-        assertThat(documents).containsExactly(email1, email2).inOrder();
-
-        // Query for "little OR stout". It should match both emails.
-        searchResults = mDb1.query("little OR stout", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_RELEVANCE_SCORE)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email2 should be ranked higher because 'little' appears once and "stout", which is a
-        // rarer term, appears once. email1 only has the three 'little' appearances.
-        assertThat(documents).containsExactly(email2, email1).inOrder();
-    }
-
-    @Test
-    public void testQuery_typeFilter() throws Exception {
-        // Schema registration
-        AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic")
-                .addProperty(new PropertyConfig.Builder("foo")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .build()
-                ).build();
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(genericSchema)
-                        .build()).get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument inDoc = new GenericDocument.Builder<>("uri2", "Generic")
-                .setPropertyString("foo", "body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail, inDoc).build()));
-
-        // Query for the documents
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(2);
-        assertThat(documents).containsExactly(inEmail, inDoc);
-
-        // Query only for Document
-        searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .addSchemaType("Generic", "Generic") // duplicate type in filter won't matter.
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents).containsExactly(inDoc);
-    }
-
-    @Test
-    public void testQuery_namespaceFilter() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-            .get();
-
-        // Index two documents
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("expectedNamespace")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail unexpectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("unexpectedNamespace")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(expectedEmail, unexpectedEmail).build()));
-
-        // Query for all namespaces
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(2);
-        assertThat(documents).containsExactly(expectedEmail, unexpectedEmail);
-
-        // Query only for expectedNamespace
-        searchResults = mDb1.query("body",
-                new SearchSpec.Builder()
-                        .addNamespace("expectedNamespace")
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents).containsExactly(expectedEmail);
-    }
-
-    @Test
-    public void testQuery_getPackageName() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail).build()));
-
-        // Query for the document
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-
-        List<SearchResult> results;
-        List<GenericDocument> documents = new ArrayList<>();
-        // keep loading next page until it's empty.
-        do {
-            results = searchResults.getNextPage().get();
-            for (SearchResult result : results) {
-                assertThat(result.getDocument()).isEqualTo(inEmail);
-                assertThat(result.getPackageName()).isEqualTo(
-                        ApplicationProvider.getApplicationContext().getPackageName());
-                documents.add(result.getDocument());
-            }
-        } while (results.size() > 0);
-        assertThat(documents).hasSize(1);
-    }
-
-    @Test
-    public void testQuery_projection() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"Email", ["body", "to"]}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection(AppSearchEmail.SCHEMA_TYPE, "body", "to")
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email document should have been returned with only the "body" and "to"
-        // properties. The note document should have been returned with all of its properties.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_projectionEmpty() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"Email", []}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection(AppSearchEmail.SCHEMA_TYPE, Collections.emptyList())
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email document should have been returned without any properties. The note document
-        // should have been returned with all of its properties.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_projectionNonExistentType() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"NonExistentType", []}, {"Email", ["body", "to"]}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection("NonExistentType", Collections.emptyList())
-                .addProjection(AppSearchEmail.SCHEMA_TYPE, "body", "to")
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email document should have been returned with only the "body" and "to" properties.
-        // The note document should have been returned with all of its properties.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_wildcardProjection() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"*", ["body", "to"]}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection(SearchSpec.PROJECTION_SCHEMA_TYPE_WILDCARD, "body", "to")
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email document should have been returned with only the "body" and "to"
-        // properties. The note document should have been returned with only the "body" property.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("body", "Note body").build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_wildcardProjectionEmpty() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"*", []}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection(SearchSpec.PROJECTION_SCHEMA_TYPE_WILDCARD, Collections.emptyList())
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email and note documents should have been returned without any properties.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000).build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_wildcardProjectionNonExistentType() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .addSchema(new AppSearchSchema.Builder("Note")
-                                .addProperty(new PropertyConfig.Builder("title")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .addProperty(new PropertyConfig.Builder("body")
-                                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_EXACT_TERMS)
-                                        .setTokenizerType(
-                                                PropertyConfig.TOKENIZER_TYPE_PLAIN).build())
-                                .build()).build()).get();
-
-        // Index two documents
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument note =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("title", "Note title")
-                        .setPropertyString("body", "Note body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email, note).build()));
-
-        // Query with type property paths {"NonExistentType", []}, {"*", ["body", "to"]}
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .addProjection("NonExistentType", Collections.emptyList())
-                .addProjection(SearchSpec.PROJECTION_SCHEMA_TYPE_WILDCARD, "body", "to")
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-
-        // The email document should have been returned with only the "body" and "to"
-        // properties. The note document should have been returned with only the "body" property.
-        AppSearchEmail expectedEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        GenericDocument expectedNote =
-                new GenericDocument.Builder<>("uri2", "Note")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setPropertyString("body", "Note body").build();
-        assertThat(documents).containsExactly(expectedNote, expectedEmail);
-    }
-
-    @Test
-    public void testQuery_twoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index a document to instance 1.
-        AppSearchEmail inEmail1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail1).build()));
-
-        // Index a document to instance 2.
-        AppSearchEmail inEmail2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail2).build()));
-
-        // Query for instance 1.
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents).containsExactly(inEmail1);
-
-        // Query for instance 2.
-        searchResults = mDb2.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(1);
-        assertThat(documents).containsExactly(inEmail2);
-    }
-
-    @Test
-    public void testSnippet() throws Exception {
-        // Schema registration
-        // TODO(tytytyww) add property for long and  double.
-        AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic")
-                .addProperty(new PropertyConfig.Builder("subject")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .build()
-                ).build();
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(genericSchema).build()).get();
-
-        // Index a document
-        GenericDocument document =
-                new GenericDocument.Builder<>("uri", "Generic")
-                        .setNamespace("document")
-                        .setPropertyString("subject", "A commonly used fake word is foo. "
-                                + "Another nonsense word that’s used a lot is bar")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(document).build()));
-
-        // Query for the document
-        SearchResults searchResults = mDb1.query("foo",
-                new SearchSpec.Builder()
-                        .addSchemaType("Generic")
-                        .setSnippetCount(1)
-                        .setSnippetCountPerProperty(1)
-                        .setMaxSnippetSize(10)
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .build());
-        List<SearchResult> results = searchResults.getNextPage().get();
-        assertThat(results).hasSize(1);
-
-        List<SearchResult.MatchInfo> matchInfos = results.get(0).getMatches();
-        assertThat(matchInfos).isNotNull();
-        assertThat(matchInfos).hasSize(1);
-        SearchResult.MatchInfo matchInfo = matchInfos.get(0);
-        assertThat(matchInfo.getFullText()).isEqualTo("A commonly used fake word is foo. "
-                + "Another nonsense word that’s used a lot is bar");
-        assertThat(matchInfo.getExactMatchPosition()).isEqualTo(
-                new SearchResult.MatchRange(/*lower=*/29,  /*upper=*/32));
-        assertThat(matchInfo.getExactMatch()).isEqualTo("foo");
-        assertThat(matchInfo.getSnippetPosition()).isEqualTo(
-                new SearchResult.MatchRange(/*lower=*/26,  /*upper=*/33));
-        assertThat(matchInfo.getSnippet()).isEqualTo("is foo.");
-    }
-
-    @Test
-    public void testRemove() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1, email2).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri2")).hasSize(1);
-
-        // Delete the document
-        checkIsBatchResultSuccess(mDb1.removeByUri(
-                new RemoveByUriRequest.Builder().addUri("uri1").build()));
-
-        // Make sure it's really gone
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1", "uri2").build())
-                .get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
-
-        // Test if we delete a nonexistent URI.
-        AppSearchBatchResult<String, Void> deleteResult = mDb1.removeByUri(
-                new RemoveByUriRequest.Builder().addUri("uri1").build()).get();
-
-        assertThat(deleteResult.getFailures().get("uri1").getResultCode()).isEqualTo(
-                AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-    @Test
-    public void testRemoveByQuery() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("foo")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("bar")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1, email2).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri2")).hasSize(1);
-
-        // Delete the email 1 by query "foo"
-        mDb1.removeByQuery("foo",
-                new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build()).get();
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1", "uri2").build())
-                .get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
-
-        // Delete the email 2 by query "bar"
-        mDb1.removeByQuery("bar",
-                new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build()).get();
-        getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri2").build())
-                .get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri2").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-    @Test
-    public void testRemove_twoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-
-        // Can't delete in the other instance.
-        AppSearchBatchResult<String, Void> deleteResult = mDb2.removeByUri(
-                new RemoveByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(deleteResult.getFailures().get("uri1").getResultCode()).isEqualTo(
-                AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-
-        // Delete the document
-        checkIsBatchResultSuccess(mDb1.removeByUri(
-                new RemoveByUriRequest.Builder().addUri("uri1").build()));
-
-        // Make sure it's really gone
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Test if we delete a nonexistent URI.
-        deleteResult = mDb1.removeByUri(
-                new RemoveByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(deleteResult.getFailures().get("uri1").getResultCode()).isEqualTo(
-                AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-    @Test
-    public void testRemoveByTypes() throws Exception {
-        // Schema registration
-        AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic").build();
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).addSchema(
-                        genericSchema).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        GenericDocument document1 =
-                new GenericDocument.Builder<>("uri3", "Generic").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1, email2, document1)
-                        .build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1", "uri2",
-                "uri3")).hasSize(3);
-
-        // Delete the email type
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .addSchemaType(AppSearchEmail.SCHEMA_TYPE)
-                        .build())
-                .get();
-
-        // Make sure it's really gone
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1", "uri2", "uri3").build())
-                .get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(getResult.getFailures().get("uri2").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(getResult.getSuccesses().get("uri3")).isEqualTo(document1);
-    }
-
-    @Test
-    public void testRemoveByTypes_twoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email2).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-        assertThat(doGet(mDb2, GenericDocument.DEFAULT_NAMESPACE, "uri2")).hasSize(1);
-
-        // Delete the email type in instance 1
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .addSchemaType(AppSearchEmail.SCHEMA_TYPE)
-                        .build())
-                .get();
-
-        // Make sure it's really gone in instance 1
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Make sure it's still in instance 2.
-        getResult = mDb2.getByUri(
-                new GetByUriRequest.Builder().addUri("uri2").build()).get();
-        assertThat(getResult.isSuccess()).isTrue();
-        assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
-    }
-
-    @Test
-    public void testRemoveByNamespace() throws Exception {
-        // Schema registration
-        AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic")
-                .addProperty(new PropertyConfig.Builder("foo")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .build()
-                ).build();
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).addSchema(
-                        genericSchema).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("email")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("email")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        GenericDocument document1 =
-                new GenericDocument.Builder<>("uri3", "Generic")
-                        .setNamespace("document")
-                        .setPropertyString("foo", "bar").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1, email2, document1)
-                        .build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, /*namespace=*/"email", "uri1", "uri2")).hasSize(2);
-        assertThat(doGet(mDb1, /*namespace=*/"document", "uri3")).hasSize(1);
-
-        // Delete the email namespace
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .addNamespace("email")
-                        .build())
-                .get();
-
-        // Make sure it's really gone
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().setNamespace("email")
-                        .addUri("uri1", "uri2").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        assertThat(getResult.getFailures().get("uri2").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-        getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().setNamespace("document")
-                        .addUri("uri3").build()).get();
-        assertThat(getResult.isSuccess()).isTrue();
-        assertThat(getResult.getSuccesses().get("uri3")).isEqualTo(document1);
-    }
-
-    @Test
-    public void testRemoveByNamespaces_twoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("email")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("email")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email2).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, /*namespace=*/"email", "uri1")).hasSize(1);
-        assertThat(doGet(mDb2, /*namespace=*/"email", "uri2")).hasSize(1);
-
-        // Delete the email namespace in instance 1
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .addNamespace("email")
-                        .build())
-                .get();
-
-        // Make sure it's really gone in instance 1
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().setNamespace("email")
-                        .addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Make sure it's still in instance 2.
-        getResult = mDb2.getByUri(
-                new GetByUriRequest.Builder().setNamespace("email")
-                        .addUri("uri2").build()).get();
-        assertThat(getResult.isSuccess()).isTrue();
-        assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
-    }
-
-    @Test
-    public void testRemoveAll_twoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email2).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, GenericDocument.DEFAULT_NAMESPACE, "uri1")).hasSize(1);
-        assertThat(doGet(mDb2, GenericDocument.DEFAULT_NAMESPACE, "uri2")).hasSize(1);
-
-        // Delete the all document in instance 1
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .build())
-                .get();
-
-        // Make sure it's really gone in instance 1
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Make sure it's still in instance 2.
-        getResult = mDb2.getByUri(
-                new GetByUriRequest.Builder().addUri("uri2").build()).get();
-        assertThat(getResult.isSuccess()).isTrue();
-        assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
-    }
-
-    @Test
-    public void testRemoveAll_termMatchType() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 2")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        AppSearchEmail email3 =
-                new AppSearchEmail.Builder("uri3")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 3")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        AppSearchEmail email4 =
-                new AppSearchEmail.Builder("uri4")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example 4")
-                        .setBody("This is the body of the testPut second email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1, email2).build()));
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email3, email4).build()));
-
-        // Check the presence of the documents
-        SearchResults searchResults = mDb1.query("", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(2);
-        searchResults = mDb2.query("", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).hasSize(2);
-
-        // Delete the all document in instance 1 with TERM_MATCH_PREFIX
-        mDb1.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                        .build())
-                .get();
-        searchResults = mDb1.query("", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).isEmpty();
-
-        // Delete the all document in instance 2 with TERM_MATCH_EXACT_ONLY
-        mDb2.removeByQuery("",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .build())
-                .get();
-        searchResults = mDb2.query("", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).isEmpty();
-    }
-
-    @Test
-    public void testRemoveAllAfterEmpty() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // Index documents
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email1).build()));
-
-        // Check the presence of the documents
-        assertThat(doGet(mDb1, "namespace", "uri1")).hasSize(1);
-
-        // Remove the document
-        checkIsBatchResultSuccess(
-                mDb1.removeByUri(new RemoveByUriRequest.Builder()
-                        .setNamespace("namespace").addUri("uri1").build()));
-
-        // Make sure it's really gone
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-
-        // Delete the all documents
-        mDb1.removeByQuery(
-                "", new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
-                .get();
-
-        // Make sure it's still gone
-        getResult = mDb1.getByUri(
-                new GetByUriRequest.Builder().addUri("uri1").build()).get();
-        assertThat(getResult.isSuccess()).isFalse();
-        assertThat(getResult.getFailures().get("uri1").getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-    @Test
-    public void testCloseAndReopen() throws Exception {
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-            .get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail).build()));
-
-        // close and re-open the appSearchSession
-        mDb1.close();
-        mDb1 = createSearchSession(DB_NAME_1).get();
-
-        // Query for the document
-        SearchResults searchResults = mDb1.query("body", new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build());
-        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
-        assertThat(documents).containsExactly(inEmail);
-    }
-
-    @Test
-    public void testCallAfterClose() throws Exception {
-
-        // Create a same-thread database by inject an executor which could help us maintain the
-        // execution order of those async tasks.
-        Context context = ApplicationProvider.getApplicationContext();
-        AppSearchSession sameThreadDb = createSearchSession(
-                "sameThreadDb", MoreExecutors.newDirectExecutorService()).get();
-
-        try {
-            // Schema registration -- just mutate something
-            sameThreadDb.setSchema(
-                    new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-            // Close the database. No further call will be allowed.
-            sameThreadDb.close();
-
-            // Try to query the closed database
-            // We are using the same-thread db here to make sure it has been closed.
-            IllegalStateException e = assertThrows(IllegalStateException.class, () ->
-                    sameThreadDb.query("query", new SearchSpec.Builder()
-                            .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                            .build()));
-            assertThat(e).hasMessageThat().contains("AppSearchSession has already been closed");
-        } finally {
-            // To clean the data that has been added in the test, need to re-open the session and
-            // set an empty schema.
-            AppSearchSession reopen = createSearchSession(
-                    "sameThreadDb", MoreExecutors.newDirectExecutorService()).get();
-            reopen.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-        }
-    }
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GenericDocumentCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GenericDocumentCtsTest.java
deleted file mode 100644
index 4fa033a..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GenericDocumentCtsTest.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*
- * Copyright 2020 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.app.cts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import androidx.appsearch.app.GenericDocument;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class GenericDocumentCtsTest {
-    private static final byte[] sByteArray1 = new byte[]{(byte) 1, (byte) 2, (byte) 3};
-    private static final byte[] sByteArray2 = new byte[]{(byte) 4, (byte) 5, (byte) 6, (byte) 7};
-    private static final GenericDocument sDocumentProperties1 = new GenericDocument
-            .Builder<>("sDocumentProperties1", "sDocumentPropertiesSchemaType1")
-            .setCreationTimestampMillis(12345L)
-            .build();
-    private static final GenericDocument sDocumentProperties2 = new GenericDocument
-            .Builder<>("sDocumentProperties2", "sDocumentPropertiesSchemaType2")
-            .setCreationTimestampMillis(6789L)
-            .build();
-
-    @Test
-    public void testDocumentEquals_identical() {
-        GenericDocument document1 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setTtlMillis(1L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .build();
-        GenericDocument document2 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setTtlMillis(1L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .build();
-        assertThat(document1).isEqualTo(document2);
-        assertThat(document1.hashCode()).isEqualTo(document2.hashCode());
-    }
-
-    @Test
-    public void testDocumentEquals_differentOrder() {
-        GenericDocument document1 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .build();
-
-        // Create second document with same parameter but different order.
-        GenericDocument document2 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .build();
-        assertThat(document1).isEqualTo(document2);
-        assertThat(document1.hashCode()).isEqualTo(document2.hashCode());
-    }
-
-    @Test
-    public void testDocumentEquals_failure() {
-        GenericDocument document1 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .build();
-
-        // Create second document with same order but different value.
-        GenericDocument document2 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyLong("longKey1", 1L, 2L, 4L) // Different
-                .build();
-        assertThat(document1).isNotEqualTo(document2);
-        assertThat(document1.hashCode()).isNotEqualTo(document2.hashCode());
-    }
-
-    @Test
-    public void testDocumentEquals_repeatedFieldOrder_failure() {
-        GenericDocument document1 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .build();
-
-        // Create second document with same order but different value.
-        GenericDocument document2 = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyBoolean("booleanKey1", true, true, false) // Different
-                .build();
-        assertThat(document1).isNotEqualTo(document2);
-        assertThat(document1.hashCode()).isNotEqualTo(document2.hashCode());
-    }
-
-    @Test
-    public void testDocumentGetSingleValue() {
-        GenericDocument document = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setScore(1)
-                .setTtlMillis(1L)
-                .setPropertyLong("longKey1", 1L)
-                .setPropertyDouble("doubleKey1", 1.0)
-                .setPropertyBoolean("booleanKey1", true)
-                .setPropertyString("stringKey1", "test-value1")
-                .setPropertyBytes("byteKey1", sByteArray1)
-                .setPropertyDocument("documentKey1", sDocumentProperties1)
-                .build();
-        assertThat(document.getUri()).isEqualTo("uri1");
-        assertThat(document.getTtlMillis()).isEqualTo(1L);
-        assertThat(document.getSchemaType()).isEqualTo("schemaType1");
-        assertThat(document.getCreationTimestampMillis()).isEqualTo(5);
-        assertThat(document.getScore()).isEqualTo(1);
-        assertThat(document.getPropertyLong("longKey1")).isEqualTo(1L);
-        assertThat(document.getPropertyDouble("doubleKey1")).isEqualTo(1.0);
-        assertThat(document.getPropertyBoolean("booleanKey1")).isTrue();
-        assertThat(document.getPropertyString("stringKey1")).isEqualTo("test-value1");
-        assertThat(document.getPropertyBytes("byteKey1"))
-                .asList().containsExactly((byte) 1, (byte) 2, (byte) 3);
-        assertThat(document.getPropertyDocument("documentKey1")).isEqualTo(sDocumentProperties1);
-    }
-
-    @Test
-    public void testDocumentGetArrayValues() {
-        GenericDocument document = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .build();
-
-        assertThat(document.getUri()).isEqualTo("uri1");
-        assertThat(document.getSchemaType()).isEqualTo("schemaType1");
-        assertThat(document.getPropertyLongArray("longKey1")).asList().containsExactly(1L, 2L, 3L);
-        assertThat(document.getPropertyDoubleArray("doubleKey1")).usingExactEquality()
-                .containsExactly(1.0, 2.0, 3.0);
-        assertThat(document.getPropertyBooleanArray("booleanKey1")).asList()
-                .containsExactly(true, false, true);
-        assertThat(document.getPropertyStringArray("stringKey1")).asList()
-                .containsExactly("test-value1", "test-value2", "test-value3");
-        assertThat(document.getPropertyBytesArray("byteKey1")).asList()
-                .containsExactly(sByteArray1, sByteArray2);
-        assertThat(document.getPropertyDocumentArray("documentKey1")).asList()
-                .containsExactly(sDocumentProperties1, sDocumentProperties2);
-    }
-
-    @Ignore
-    @Test
-    public void testDocument_toString() {
-        GenericDocument document = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setCreationTimestampMillis(5L)
-                .setPropertyLong("longKey1", 1L, 2L, 3L)
-                .setPropertyDouble("doubleKey1", 1.0, 2.0, 3.0)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyString("stringKey1", "String1", "String2", "String3")
-                .setPropertyBytes("byteKey1", sByteArray1, sByteArray2)
-                .setPropertyDocument("documentKey1", sDocumentProperties1, sDocumentProperties2)
-                .build();
-        String exceptedString = "{ key: 'creationTimestampMillis' value: 5 } "
-                + "{ key: 'namespace' value:  } "
-                + "{ key: 'properties' value: "
-                +       "{ key: 'booleanKey1' value: [ 'true' 'false' 'true' ] } "
-                +       "{ key: 'byteKey1' value: "
-                +             "{ key: 'byteArray' value: [ '1' '2' '3' ] } "
-                +             "{ key: 'byteArray' value: [ '4' '5' '6' '7' ] }  } "
-                +       "{ key: 'documentKey1' value: [ '"
-                +             "{ key: 'creationTimestampMillis' value: 12345 } "
-                +             "{ key: 'namespace' value:  } "
-                +             "{ key: 'properties' value:  } "
-                +             "{ key: 'schemaType' value: sDocumentPropertiesSchemaType1 } "
-                +             "{ key: 'score' value: 0 } "
-                +             "{ key: 'ttlMillis' value: 0 } "
-                +             "{ key: 'uri' value: sDocumentProperties1 } ' '"
-                +             "{ key: 'creationTimestampMillis' value: 6789 } "
-                +             "{ key: 'namespace' value:  } "
-                +             "{ key: 'properties' value:  } "
-                +             "{ key: 'schemaType' value: sDocumentPropertiesSchemaType2 } "
-                +             "{ key: 'score' value: 0 } "
-                +             "{ key: 'ttlMillis' value: 0 } "
-                +             "{ key: 'uri' value: sDocumentProperties2 } ' ] } "
-                +       "{ key: 'doubleKey1' value: [ '1.0' '2.0' '3.0' ] } "
-                +       "{ key: 'longKey1' value: [ '1' '2' '3' ] } "
-                +       "{ key: 'stringKey1' value: [ 'String1' 'String2' 'String3' ] }  } "
-                + "{ key: 'schemaType' value: schemaType1 } "
-                + "{ key: 'score' value: 0 } "
-                + "{ key: 'ttlMillis' value: 0 } "
-                + "{ key: 'uri' value: uri1 } ";
-        assertThat(document.toString()).isEqualTo(exceptedString);
-    }
-
-    @Test
-    public void testDocumentGetValues_differentTypes() {
-        GenericDocument document = new GenericDocument.Builder<>("uri1", "schemaType1")
-                .setScore(1)
-                .setPropertyLong("longKey1", 1L)
-                .setPropertyBoolean("booleanKey1", true, false, true)
-                .setPropertyString("stringKey1", "test-value1", "test-value2", "test-value3")
-                .build();
-
-        // Get a value for a key that doesn't exist
-        assertThat(document.getPropertyDouble("doubleKey1")).isEqualTo(0.0);
-        assertThat(document.getPropertyDoubleArray("doubleKey1")).isNull();
-
-        // Get a value with a single element as an array and as a single value
-        assertThat(document.getPropertyLong("longKey1")).isEqualTo(1L);
-        assertThat(document.getPropertyLongArray("longKey1")).asList().containsExactly(1L);
-
-        // Get a value with multiple elements as an array and as a single value
-        assertThat(document.getPropertyString("stringKey1")).isEqualTo("test-value1");
-        assertThat(document.getPropertyStringArray("stringKey1")).asList()
-                .containsExactly("test-value1", "test-value2", "test-value3");
-
-        // Get a value of the wrong type
-        assertThat(document.getPropertyDouble("longKey1")).isEqualTo(0.0);
-        assertThat(document.getPropertyDoubleArray("longKey1")).isNull();
-    }
-
-    @Test
-    public void testDocumentInvalid() {
-        GenericDocument.Builder<?> builder = new GenericDocument.Builder<>("uri1", "schemaType1");
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> builder.setPropertyBoolean("test", new boolean[]{}));
-    }
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GlobalSearchSessionCtsTestBase.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GlobalSearchSessionCtsTestBase.java
deleted file mode 100644
index 0120153..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/GlobalSearchSessionCtsTestBase.java
+++ /dev/null

@@ -1,568 +0,0 @@
-/*
- * Copyright 2020 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.app.cts;
-
-import static androidx.appsearch.app.util.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static androidx.appsearch.app.util.AppSearchTestUtils.convertSearchResultsToDocuments;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.appsearch.app.AppSearchEmail;
-import androidx.appsearch.app.AppSearchSchema;
-import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
-import androidx.appsearch.app.AppSearchSession;
-import androidx.appsearch.app.GenericDocument;
-import androidx.appsearch.app.GlobalSearchSession;
-import androidx.appsearch.app.PutDocumentsRequest;
-import androidx.appsearch.app.SearchResult;
-import androidx.appsearch.app.SearchResults;
-import androidx.appsearch.app.SearchSpec;
-import androidx.appsearch.app.SetSchemaRequest;
-import androidx.appsearch.localstorage.LocalStorage;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public abstract class GlobalSearchSessionCtsTestBase {
-    private AppSearchSession mDb1;
-    private static final String DB_NAME_1 = LocalStorage.DEFAULT_DATABASE_NAME;
-    private AppSearchSession mDb2;
-    private static final String DB_NAME_2 = "testDb2";
-
-    private GlobalSearchSession mGlobalAppSearchManager;
-
-    protected abstract ListenableFuture<AppSearchSession> createSearchSession(
-            @NonNull String dbName);
-    protected abstract ListenableFuture<GlobalSearchSession> createGlobalSearchSession();
-
-    @Before
-    public void setUp() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
-
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        mDb2 = createSearchSession(DB_NAME_2).get();
-
-        // Cleanup whatever documents may still exist in these databases. This is needed in
-        // addition to tearDown in case a test exited without completing properly.
-        cleanup();
-
-        mGlobalAppSearchManager = createGlobalSearchSession().get();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        // Cleanup whatever documents may still exist in these databases.
-        cleanup();
-    }
-
-    private void cleanup() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-    }
-
-    private List<GenericDocument> snapshotResults(String queryExpression, SearchSpec spec)
-            throws Exception {
-        SearchResults searchResults = mGlobalAppSearchManager.query(queryExpression, spec);
-        return convertSearchResultsToDocuments(searchResults);
-    }
-
-    /**
-     * Asserts that the union of {@code addedDocuments} and {@code beforeDocuments} is exactly
-     * equivalent to {@code afterDocuments}. Order doesn't matter.
-     *
-     * @param beforeDocuments Documents that existed first.
-     * @param afterDocuments  The total collection of documents that should exist now.
-     * @param addedDocuments  The collection of documents that were expected to be added.
-     */
-    private void assertAddedBetweenSnapshots(List<? extends GenericDocument> beforeDocuments,
-            List<? extends GenericDocument> afterDocuments,
-            List<? extends GenericDocument> addedDocuments) {
-        List<GenericDocument> expectedDocuments = new ArrayList<>(beforeDocuments);
-        expectedDocuments.addAll(addedDocuments);
-        assertThat(afterDocuments).containsExactlyElementsIn(expectedDocuments);
-    }
-
-    @Test
-    public void testGlobalQuery_oneInstance() throws Exception {
-        // Snapshot what documents may already exist on the device.
-        SearchSpec exactSearchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build();
-        List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
-        List<GenericDocument> beforeBodyEmailDocuments = snapshotResults("body email",
-                exactSearchSpec);
-
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-
-        // Index a document
-        AppSearchEmail inEmail =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail).build()));
-
-        // Query for the document
-        List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyDocuments, afterBodyDocuments,
-                Collections.singletonList(inEmail));
-
-        // Multi-term query
-        List<GenericDocument> afterBodyEmailDocuments = snapshotResults("body email",
-                exactSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyEmailDocuments, afterBodyEmailDocuments,
-                Collections.singletonList(inEmail));
-    }
-
-    @Test
-    public void testGlobalQuery_twoInstances() throws Exception {
-        // Snapshot what documents may already exist on the device.
-        SearchSpec exactSearchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build();
-        List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
-
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-
-        // Index a document to instance 1.
-        AppSearchEmail inEmail1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail1).build()));
-
-        // Index a document to instance 2.
-        AppSearchEmail inEmail2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(inEmail2).build()));
-
-        // Query across all instances
-        List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyDocuments, afterBodyDocuments,
-                ImmutableList.of(inEmail1, inEmail2));
-    }
-
-    @Test
-    public void testGlobalQuery_getNextPage() throws Exception {
-        // Snapshot what documents may already exist on the device.
-        SearchSpec exactSearchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build();
-        List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
-
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-        List<AppSearchEmail> emailList = new ArrayList<>();
-        PutDocumentsRequest.Builder putDocumentsRequestBuilder = new PutDocumentsRequest.Builder();
-
-        // Index 31 documents
-        for (int i = 0; i < 31; i++) {
-            AppSearchEmail inEmail =
-                    new AppSearchEmail.Builder("uri" + i)
-                            .setFrom("from@example.com")
-                            .setTo("to1@example.com", "to2@example.com")
-                            .setSubject("testPut example")
-                            .setBody("This is the body of the testPut email")
-                            .build();
-            emailList.add(inEmail);
-            putDocumentsRequestBuilder.addGenericDocument(inEmail);
-        }
-        checkIsBatchResultSuccess(mDb1.putDocuments(putDocumentsRequestBuilder.build()));
-
-        // Set number of results per page is 7.
-        int pageSize = 7;
-        SearchResults searchResults = mGlobalAppSearchManager.query("body",
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .setResultCountPerPage(pageSize)
-                        .build());
-        List<GenericDocument> documents = new ArrayList<>();
-
-        int pageNumber = 0;
-        List<SearchResult> results;
-
-        // keep loading next page until it's empty.
-        do {
-            results = searchResults.getNextPage().get();
-            ++pageNumber;
-            for (SearchResult result : results) {
-                documents.add(result.getDocument());
-            }
-        } while (results.size() > 0);
-
-        // check all document presents
-        assertAddedBetweenSnapshots(beforeBodyDocuments, documents, emailList);
-
-        int totalDocuments = beforeBodyDocuments.size() + documents.size();
-
-        // +1 for final empty page
-        int expectedPages = (int) Math.ceil(totalDocuments * 1.0 / pageSize) + 1;
-        assertThat(pageNumber).isEqualTo(expectedPages);
-    }
-
-    @Test
-    public void testGlobalQuery_acrossTypes() throws Exception {
-        // Snapshot what documents may already exist on the device.
-        SearchSpec exactSearchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build();
-        List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
-
-        SearchSpec exactEmailSearchSpec =
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addSchemaType(AppSearchEmail.SCHEMA_TYPE)
-                        .build();
-        List<GenericDocument> beforeBodyEmailDocuments = snapshotResults("body",
-                exactEmailSearchSpec);
-
-        // Schema registration
-        AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic")
-                .addProperty(new PropertyConfig.Builder("foo")
-                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
-                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                        .build()
-                ).build();
-
-        // db1 has both "Generic" and "builtin:Email"
-        mDb1.setSchema(new SetSchemaRequest.Builder()
-                .addSchema(genericSchema).addSchema(AppSearchEmail.SCHEMA).build()).get();
-
-        // db2 only has "builtin:Email"
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-
-        // Index a generic document into db1
-        GenericDocument genericDocument = new GenericDocument.Builder<>("uri2", "Generic")
-                .setPropertyString("foo", "body").build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(genericDocument).build()));
-
-        AppSearchEmail email =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-
-        // Put the email in both databases
-        checkIsBatchResultSuccess((mDb1.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email).build())));
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(email).build()));
-
-        // Query for all documents across types
-        List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyDocuments, afterBodyDocuments,
-                ImmutableList.of(genericDocument, email, email));
-
-        // Query only for email documents
-        List<GenericDocument> afterBodyEmailDocuments = snapshotResults("body",
-                exactEmailSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyEmailDocuments, afterBodyEmailDocuments,
-                ImmutableList.of(email, email));
-    }
-
-    @Test
-    public void testGlobalQuery_namespaceFilter() throws Exception {
-        // Snapshot what documents may already exist on the device.
-        SearchSpec exactSearchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                .build();
-        List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
-
-        SearchSpec exactNamespace1SearchSpec =
-                new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addNamespace("namespace1")
-                        .build();
-        List<GenericDocument> beforeBodyNamespace1Documents = snapshotResults("body",
-                exactNamespace1SearchSpec);
-
-        // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchema(AppSearchEmail.SCHEMA).build())
-                .get();
-
-        // Index two documents
-        AppSearchEmail document1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace1")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(document1).build()));
-
-        AppSearchEmail document2 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace2")
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder().addGenericDocument(document2).build()));
-
-        // Query for all namespaces
-        List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyDocuments, afterBodyDocuments,
-                ImmutableList.of(document1, document2));
-
-        // Query only for "namespace1"
-        List<GenericDocument> afterBodyNamespace1Documents = snapshotResults("body",
-                exactNamespace1SearchSpec);
-        assertAddedBetweenSnapshots(beforeBodyNamespace1Documents, afterBodyNamespace1Documents,
-                ImmutableList.of(document1));
-    }
-
-    // TODO(b/175039682) Add test cases for wildcard projection once go/oag/1534646 is submitted.
-    @Test
-    public void testGlobalQuery_projectionTwoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-        mDb2.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-
-        // Index one document in each database.
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email1).build()));
-
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email2).build()));
-
-        // Query with type property paths {"Email", ["subject", "to"]}
-        List<GenericDocument> documents =
-                snapshotResults("body", new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addProjection(AppSearchEmail.SCHEMA_TYPE,
-                                "subject", "to")
-                        .build());
-
-        // The two email documents should have been returned with only the "subject" and "to"
-        // properties.
-        AppSearchEmail expected1 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .build();
-        AppSearchEmail expected2 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .build();
-        assertThat(documents).containsExactly(expected1, expected2);
-    }
-
-    @Test
-    public void testGlobalQuery_projectionEmptyTwoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-        mDb2.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-
-        // Index one document in each database.
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email1).build()));
-
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email2).build()));
-
-        // Query with type property paths {"Email", []}
-        List<GenericDocument> documents =
-                snapshotResults("body", new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addProjection(AppSearchEmail.SCHEMA_TYPE,
-                                Collections.emptyList())
-                        .build());
-
-        // The two email documents should have been returned without any properties.
-        AppSearchEmail expected1 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .build();
-        AppSearchEmail expected2 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .build();
-        assertThat(documents).containsExactly(expected1, expected2);
-    }
-
-    @Test
-    public void testGlobalQuery_projectionNonExistentTypeTwoInstances() throws Exception {
-        // Schema registration
-        mDb1.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-        mDb2.setSchema(
-                new SetSchemaRequest.Builder()
-                        .addSchema(AppSearchEmail.SCHEMA)
-                        .build()).get();
-
-        // Index one document in each database.
-        AppSearchEmail email1 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb1.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email1).build()));
-
-        AppSearchEmail email2 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setFrom("from@example.com")
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .setBody("This is the body of the testPut email")
-                        .build();
-        checkIsBatchResultSuccess(mDb2.putDocuments(
-                new PutDocumentsRequest.Builder()
-                        .addGenericDocument(email2).build()));
-
-        // Query with type property paths {"NonExistentType", []}, {"Email", ["subject", "to"]}
-        List<GenericDocument> documents =
-                snapshotResults("body", new SearchSpec.Builder()
-                        .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addProjection("NonExistentType", Collections.emptyList())
-                        .addProjection(AppSearchEmail.SCHEMA_TYPE, "subject", "to")
-                        .build());
-
-        // The two email documents should have been returned with only the "subject" and "to"
-        // properties.
-        AppSearchEmail expected1 =
-                new AppSearchEmail.Builder("uri2")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .build();
-        AppSearchEmail expected2 =
-                new AppSearchEmail.Builder("uri1")
-                        .setNamespace("namespace")
-                        .setCreationTimestampMillis(1000)
-                        .setTo("to1@example.com", "to2@example.com")
-                        .setSubject("testPut example")
-                        .build();
-        assertThat(documents).containsExactly(expected1, expected2);
-    }
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/SearchSpecCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/SearchSpecCtsTest.java
deleted file mode 100644
index ad3c9a5..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/SearchSpecCtsTest.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*
- * Copyright 2020 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.app.cts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import androidx.appsearch.app.SearchSpec;
-
-import org.junit.Test;
-
-public class SearchSpecCtsTest {
-    @Test
-    public void buildSearchSpecWithoutTermMatchType() {
-        RuntimeException e = assertThrows(RuntimeException.class, () -> new SearchSpec.Builder()
-                .addSchemaType("testSchemaType")
-                .build());
-        assertThat(e).hasMessageThat().contains("Missing termMatchType field");
-    }
-
-    @Test
-    public void testBuildSearchSpec() {
-        SearchSpec searchSpec = new SearchSpec.Builder()
-                .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                .addNamespace("namespace1", "namespace2")
-                .addSchemaType("schemaTypes1", "schemaTypes2")
-                .setSnippetCount(5)
-                .setSnippetCountPerProperty(10)
-                .setMaxSnippetSize(15)
-                .setResultCountPerPage(42)
-                .setOrder(SearchSpec.ORDER_ASCENDING)
-                .setRankingStrategy(SearchSpec.RANKING_STRATEGY_DOCUMENT_SCORE)
-                .build();
-
-        assertThat(searchSpec.getTermMatch()).isEqualTo(SearchSpec.TERM_MATCH_PREFIX);
-        assertThat(searchSpec.getNamespaces())
-                .containsExactly("namespace1", "namespace2").inOrder();
-        assertThat(searchSpec.getSchemaTypes())
-                .containsExactly("schemaTypes1", "schemaTypes2").inOrder();
-        assertThat(searchSpec.getSnippetCount()).isEqualTo(5);
-        assertThat(searchSpec.getSnippetCountPerProperty()).isEqualTo(10);
-        assertThat(searchSpec.getMaxSnippetSize()).isEqualTo(15);
-        assertThat(searchSpec.getResultCountPerPage()).isEqualTo(42);
-        assertThat(searchSpec.getOrder()).isEqualTo(SearchSpec.ORDER_ASCENDING);
-        assertThat(searchSpec.getRankingStrategy())
-                .isEqualTo(SearchSpec.RANKING_STRATEGY_DOCUMENT_SCORE);
-    }
-}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/customer/EmailDataClass.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/customer/EmailDataClass.java
deleted file mode 100644
index 1f8136d..0000000
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/customer/EmailDataClass.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*
- * Copyright 2020 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:skipFile()
-package androidx.appsearch.app.cts.customer;
-
-import androidx.appsearch.annotation.AppSearchDocument;
-import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
-
-@AppSearchDocument
-public final class EmailDataClass {
-    @AppSearchDocument.Uri
-    public String uri;
-
-    @AppSearchDocument.Property(indexingType = PropertyConfig.INDEXING_TYPE_PREFIXES)
-    public String subject;
-
-    @AppSearchDocument.Property(indexingType = PropertyConfig.INDEXING_TYPE_PREFIXES)
-    public String body;
-}

diff --git a/appsearch/appsearch/src/main/java/androidx/appsearch/app/AppSearchEmail.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchEmail.java
similarity index 63%
rename from appsearch/appsearch/src/main/java/androidx/appsearch/app/AppSearchEmail.java
rename to appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchEmail.java
index 9f7aa0e..651e6d3 100644
--- a/appsearch/appsearch/src/main/java/androidx/appsearch/app/AppSearchEmail.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchEmail.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 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.
@@ -14,22 +14,20 @@
  * limitations under the License.
  */
 
-package androidx.appsearch.app;
-
+package androidx.appsearch.app.util;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import androidx.appsearch.app.AppSearchSchema;
 import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
+import androidx.appsearch.app.GenericDocument;
 
 /**
  * Encapsulates a {@link GenericDocument} that represent an email.
  *
  * <p>This class is a higher level implement of {@link GenericDocument}.
- *
- * @hide
  */
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AppSearchEmail extends GenericDocument {
     /** The name of the schema type for {@link AppSearchEmail} documents.*/
     public static final String SCHEMA_TYPE = "builtin:Email";
@@ -42,46 +40,40 @@
     private static final String KEY_BODY = "body";
 
     public static final AppSearchSchema SCHEMA = new AppSearchSchema.Builder(SCHEMA_TYPE)
-            .addProperty(new PropertyConfig.Builder(KEY_FROM)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            .addProperty(new StringPropertyConfig.Builder(KEY_FROM)
                     .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
-            ).addProperty(new PropertyConfig.Builder(KEY_TO)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            ).addProperty(new StringPropertyConfig.Builder(KEY_TO)
                     .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
-            ).addProperty(new PropertyConfig.Builder(KEY_CC)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            ).addProperty(new StringPropertyConfig.Builder(KEY_CC)
                     .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
-            ).addProperty(new PropertyConfig.Builder(KEY_BCC)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            ).addProperty(new StringPropertyConfig.Builder(KEY_BCC)
                     .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
-            ).addProperty(new PropertyConfig.Builder(KEY_SUBJECT)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            ).addProperty(new StringPropertyConfig.Builder(KEY_SUBJECT)
                     .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
-            ).addProperty(new PropertyConfig.Builder(KEY_BODY)
-                    .setDataType(PropertyConfig.DATA_TYPE_STRING)
+            ).addProperty(new StringPropertyConfig.Builder(KEY_BODY)
                     .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                    .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                     .build()
 
             ).build();
@@ -160,69 +152,63 @@
     /**
      * The builder class for {@link AppSearchEmail}.
      */
-    public static class Builder extends GenericDocument.Builder<AppSearchEmail.Builder> {
-
+    public static class Builder extends GenericDocument.Builder<Builder> {
         /**
-         * Creates a new {@link AppSearchEmail.Builder}
+         * Creates a new {@link Builder}
          *
-         * @param uri The Uri of the Email.
+         * @param namespace The namespace of the Email.
+         * @param id The ID of the Email.
          */
-        public Builder(@NonNull String uri) {
-            super(uri, SCHEMA_TYPE);
+        public Builder(@NonNull String namespace, @NonNull String id) {
+            super(namespace, id, SCHEMA_TYPE);
         }
 
         /**
          * Sets the from address of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setFrom(@NonNull String from) {
-            setPropertyString(KEY_FROM, from);
-            return this;
+        public Builder setFrom(@NonNull String from) {
+            return setPropertyString(KEY_FROM, from);
         }
 
         /**
          * Sets the destination address of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setTo(@NonNull String... to) {
-            setPropertyString(KEY_TO, to);
-            return this;
+        public Builder setTo(@NonNull String... to) {
+            return setPropertyString(KEY_TO, to);
         }
 
         /**
          * Sets the CC list of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setCc(@NonNull String... cc) {
-            setPropertyString(KEY_CC, cc);
-            return this;
+        public Builder setCc(@NonNull String... cc) {
+            return setPropertyString(KEY_CC, cc);
         }
 
         /**
          * Sets the BCC list of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setBcc(@NonNull String... bcc) {
-            setPropertyString(KEY_BCC, bcc);
-            return this;
+        public Builder setBcc(@NonNull String... bcc) {
+            return setPropertyString(KEY_BCC, bcc);
         }
 
         /**
          * Sets the subject of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setSubject(@NonNull String subject) {
-            setPropertyString(KEY_SUBJECT, subject);
-            return this;
+        public Builder setSubject(@NonNull String subject) {
+            return setPropertyString(KEY_SUBJECT, subject);
         }
 
         /**
          * Sets the body of {@link AppSearchEmail}
          */
         @NonNull
-        public AppSearchEmail.Builder setBody(@NonNull String body) {
-            setPropertyString(KEY_BODY, body);
-            return this;
+        public Builder setBody(@NonNull String body) {
+            return setPropertyString(KEY_BODY, body);
         }
 
         /** Builds the {@link AppSearchEmail} object. */

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchTestUtils.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchTestUtils.java
index e9cade2..6e27675 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchTestUtils.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/util/AppSearchTestUtils.java

@@ -22,12 +22,13 @@
 import androidx.appsearch.app.AppSearchBatchResult;
 import androidx.appsearch.app.AppSearchSession;
 import androidx.appsearch.app.GenericDocument;
-import androidx.appsearch.app.GetByUriRequest;
+import androidx.appsearch.app.GetByDocumentIdRequest;
 import androidx.appsearch.app.SearchResult;
 import androidx.appsearch.app.SearchResults;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Future;
 
 public class AppSearchTestUtils {
@@ -41,30 +42,51 @@
     }
 
     public static List<GenericDocument> doGet(
-            AppSearchSession session, String namespace, String... uris) throws Exception {
+            AppSearchSession session, String namespace, String... ids) throws Exception {
         AppSearchBatchResult<String, GenericDocument> result = checkIsBatchResultSuccess(
-                session.getByUri(
-                        new GetByUriRequest.Builder()
-                                .setNamespace(namespace).addUri(uris).build()));
-        assertThat(result.getSuccesses()).hasSize(uris.length);
+                session.getByDocumentId(
+                        new GetByDocumentIdRequest.Builder(namespace).addIds(ids).build()));
+        assertThat(result.getSuccesses()).hasSize(ids.length);
         assertThat(result.getFailures()).isEmpty();
-        List<GenericDocument> list = new ArrayList<>(uris.length);
-        for (String uri : uris) {
-            list.add(result.getSuccesses().get(uri));
+        List<GenericDocument> list = new ArrayList<>(ids.length);
+        for (String id : ids) {
+            list.add(result.getSuccesses().get(id));
+        }
+        return list;
+    }
+
+    public static List<GenericDocument> doGet(
+            AppSearchSession session, GetByDocumentIdRequest request) throws Exception {
+        AppSearchBatchResult<String, GenericDocument> result = checkIsBatchResultSuccess(
+                session.getByDocumentId(request));
+        Set<String> ids = request.getIds();
+        assertThat(result.getSuccesses()).hasSize(ids.size());
+        assertThat(result.getFailures()).isEmpty();
+        List<GenericDocument> list = new ArrayList<>(ids.size());
+        for (String id : ids) {
+            list.add(result.getSuccesses().get(id));
         }
         return list;
     }
 
     public static List<GenericDocument> convertSearchResultsToDocuments(SearchResults searchResults)
             throws Exception {
-        List<SearchResult> results = searchResults.getNextPage().get();
-        List<GenericDocument> documents = new ArrayList<>();
-        while (results.size() > 0) {
-            for (SearchResult result : results) {
-                documents.add(result.getDocument());
-            }
-            results = searchResults.getNextPage().get();
+        List<SearchResult> results = retrieveAllSearchResults(searchResults);
+        List<GenericDocument> documents = new ArrayList<>(results.size());
+        for (SearchResult result : results) {
+            documents.add(result.getGenericDocument());
         }
         return documents;
     }
+
+    public static List<SearchResult> retrieveAllSearchResults(SearchResults searchResults)
+            throws Exception {
+        List<SearchResult> page = searchResults.getNextPage().get();
+        List<SearchResult> results = new ArrayList<>();
+        while (!page.isEmpty()) {
+            results.addAll(page);
+            page = searchResults.getNextPage().get();
+        }
+        return results;
+    }
 }

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchBatchResultCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchBatchResultCtsTest.java
new file mode 100644
index 0000000..0f8a50e
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchBatchResultCtsTest.java

@@ -0,0 +1,119 @@
+/*
+ * 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.cts.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.appsearch.app.AppSearchBatchResult;
+import androidx.appsearch.app.AppSearchResult;
+
+import org.junit.Test;
+
+public class AppSearchBatchResultCtsTest {
+    @Test
+    public void testIsSuccess_true() {
+        AppSearchBatchResult<String, Integer> result =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setSuccess("keySuccess1", 1)
+                        .setSuccess("keySuccess2", 2)
+                        .setResult("keySuccess3", AppSearchResult.newSuccessfulResult(3))
+                        .build();
+        assertThat(result.isSuccess()).isTrue();
+    }
+
+    @Test
+    public void testIsSuccess_false() {
+        AppSearchBatchResult<String, Integer> result1 =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setSuccess("keySuccess1", 1)
+                        .setSuccess("keySuccess2", 2)
+                        .setFailure(
+                                "keyFailure1", AppSearchResult.RESULT_UNKNOWN_ERROR, "message1")
+                        .build();
+
+        AppSearchBatchResult<String, Integer> result2 =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setSuccess("keySuccess1", 1)
+                        .setResult(
+                                "keyFailure3",
+                                AppSearchResult.newFailedResult(
+                                        AppSearchResult.RESULT_INVALID_ARGUMENT, "message3"))
+                        .build();
+
+        assertThat(result1.isSuccess()).isFalse();
+        assertThat(result2.isSuccess()).isFalse();
+    }
+
+    @Test
+    public void testIsSuccess_replace() {
+        AppSearchBatchResult<String, Integer> result1 =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setSuccess("key", 1)
+                        .setFailure("key", AppSearchResult.RESULT_UNKNOWN_ERROR, "message1")
+                        .build();
+
+        AppSearchBatchResult<String, Integer> result2 =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setFailure("key", AppSearchResult.RESULT_UNKNOWN_ERROR, "message1")
+                        .setSuccess("key", 1)
+                        .build();
+
+        assertThat(result1.isSuccess()).isFalse();
+        assertThat(result2.isSuccess()).isTrue();
+    }
+
+    @Test
+    public void testGetters() {
+        AppSearchBatchResult<String, Integer> result =
+                new AppSearchBatchResult.Builder<String, Integer>()
+                        .setSuccess("keySuccess1", 1)
+                        .setSuccess("keySuccess2", 2)
+                        .setFailure(
+                                "keyFailure1", AppSearchResult.RESULT_UNKNOWN_ERROR, "message1")
+                        .setFailure(
+                                "keyFailure2", AppSearchResult.RESULT_INTERNAL_ERROR, "message2")
+                        .setResult("keySuccess3", AppSearchResult.newSuccessfulResult(3))
+                        .setResult(
+                                "keyFailure3",
+                                AppSearchResult.newFailedResult(
+                                        AppSearchResult.RESULT_INVALID_ARGUMENT, "message3"))
+                        .build();
+
+        assertThat(result.isSuccess()).isFalse();
+        assertThat(result.getSuccesses()).containsExactly(
+                "keySuccess1", 1, "keySuccess2", 2, "keySuccess3", 3);
+        assertThat(result.getFailures()).containsExactly(
+                "keyFailure1",
+                AppSearchResult.newFailedResult(AppSearchResult.RESULT_UNKNOWN_ERROR, "message1"),
+                "keyFailure2",
+                AppSearchResult.newFailedResult(AppSearchResult.RESULT_INTERNAL_ERROR, "message2"),
+                "keyFailure3",
+                AppSearchResult.newFailedResult(
+                        AppSearchResult.RESULT_INVALID_ARGUMENT, "message3"));
+        assertThat(result.getAll()).containsExactly(
+                "keySuccess1", AppSearchResult.newSuccessfulResult(1),
+                "keySuccess2", AppSearchResult.newSuccessfulResult(2),
+                "keySuccess3", AppSearchResult.newSuccessfulResult(3),
+                "keyFailure1",
+                AppSearchResult.newFailedResult(AppSearchResult.RESULT_UNKNOWN_ERROR, "message1"),
+                "keyFailure2",
+                AppSearchResult.newFailedResult(AppSearchResult.RESULT_INTERNAL_ERROR, "message2"),
+                "keyFailure3",
+                AppSearchResult.newFailedResult(
+                        AppSearchResult.RESULT_INVALID_ARGUMENT, "message3"));
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchMigratorTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchMigratorTest.java
new file mode 100644
index 0000000..bf9ad8f
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchMigratorTest.java

@@ -0,0 +1,130 @@
+/*
+ * 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.cts.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.annotation.NonNull;
+import androidx.appsearch.app.GenericDocument;
+import androidx.appsearch.app.Migrator;
+
+import org.junit.Test;
+
+public class AppSearchMigratorTest {
+
+    @Test
+    public void testOnUpgrade() {
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return new GenericDocument.Builder<>(document.getNamespace(), document.getId(),
+                        document.getSchemaType())
+                        .setCreationTimestampMillis(document.getCreationTimestampMillis())
+                        .setScore(document.getScore())
+                        .setTtlMillis(document.getTtlMillis())
+                        .setPropertyString("migration",
+                                "Upgrade the document from version " + currentVersion
+                                        + " to version " + finalVersion)
+                        .build();
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        GenericDocument input = new GenericDocument.Builder<>("namespace", "id",
+                "schemaType")
+                .setCreationTimestampMillis(12345L)
+                .setScore(100)
+                .setTtlMillis(54321L).build();
+
+        GenericDocument expected = new GenericDocument.Builder<>("namespace", "id",
+                "schemaType")
+                .setCreationTimestampMillis(12345L)
+                .setScore(100)
+                .setTtlMillis(54321L)
+                .setPropertyString("migration",
+                        "Upgrade the document from version 3 to version 5")
+                .build();
+
+        GenericDocument output = migrator.onUpgrade(/*currentVersion=*/3,
+                /*finalVersion=*/5, input);
+        assertThat(output).isEqualTo(expected);
+    }
+
+    @Test
+    public void testOnDowngrade() {
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return new GenericDocument.Builder<>(document.getNamespace(), document.getId(),
+                        document.getSchemaType())
+                        .setCreationTimestampMillis(document.getCreationTimestampMillis())
+                        .setScore(document.getScore())
+                        .setTtlMillis(document.getTtlMillis())
+                        .setPropertyString("migration",
+                                "Downgrade the document from version " + currentVersion
+                                        + " to version " + finalVersion)
+                        .build();
+            }
+        };
+
+        GenericDocument input = new GenericDocument.Builder<>("namespace", "id",
+                "schemaType")
+                .setCreationTimestampMillis(12345L)
+                .setScore(100)
+                .setTtlMillis(54321L).build();
+
+        GenericDocument expected = new GenericDocument.Builder<>("namespace", "id",
+                "schemaType")
+                .setCreationTimestampMillis(12345L)
+                .setScore(100)
+                .setTtlMillis(54321L)
+                .setPropertyString("migration",
+                        "Downgrade the document from version 6 to version 4")
+                .build();
+
+        GenericDocument output = migrator.onDowngrade(/*currentVersion=*/6,
+                /*finalVersion=*/4, input);
+        assertThat(output).isEqualTo(expected);
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchResultCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchResultCtsTest.java
similarity index 98%
rename from appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchResultCtsTest.java
rename to appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchResultCtsTest.java
index 5899068..91dacdb 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/app/cts/AppSearchResultCtsTest.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchResultCtsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.appsearch.app.cts;
+package androidx.appsearch.cts.app;
 
 import static com.google.common.truth.Truth.assertThat;
 

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaCtsTest.java
new file mode 100644
index 0000000..2ae353a
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaCtsTest.java

@@ -0,0 +1,371 @@
+/*
+ * Copyright 2020 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.cts.app;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import androidx.appsearch.app.AppSearchSchema;
+import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
+import androidx.appsearch.app.util.AppSearchEmail;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class AppSearchSchemaCtsTest {
+    @Test
+    public void testInvalidEnums() {
+        StringPropertyConfig.Builder builder = new StringPropertyConfig.Builder("test");
+        assertThrows(IllegalArgumentException.class, () -> builder.setCardinality(99));
+    }
+
+    @Test
+    public void testDefaultValues() {
+        StringPropertyConfig builder = new StringPropertyConfig.Builder("test").build();
+        assertThat(builder.getIndexingType()).isEqualTo(StringPropertyConfig.INDEXING_TYPE_NONE);
+        assertThat(builder.getTokenizerType()).isEqualTo(StringPropertyConfig.TOKENIZER_TYPE_NONE);
+        assertThat(builder.getCardinality()).isEqualTo(PropertyConfig.CARDINALITY_OPTIONAL);
+    }
+
+    @Test
+    public void testDuplicateProperties() {
+        AppSearchSchema.Builder builder = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                );
+        IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
+                () -> builder.addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()));
+        assertThat(e).hasMessageThat().contains("Property defined more than once: subject");
+    }
+
+    @Test
+    public void testEquals_identical() {
+        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        assertThat(schema1).isEqualTo(schema2);
+        assertThat(schema1.hashCode()).isEqualTo(schema2.hashCode());
+    }
+
+    @Test
+    public void testEquals_differentOrder() {
+        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .build()
+                ).build();
+        assertThat(schema1).isEqualTo(schema2);
+        assertThat(schema1.hashCode()).isEqualTo(schema2.hashCode());
+    }
+
+    @Test
+    public void testEquals_failure_differentProperty() {
+        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)  // Diff
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        assertThat(schema1).isNotEqualTo(schema2);
+        assertThat(schema1.hashCode()).isNotEqualTo(schema2.hashCode());
+    }
+
+    @Test
+    public void testEquals_failure_differentOrder() {
+        AppSearchSchema schema1 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).addProperty(new StringPropertyConfig.Builder("body")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        // Order of 'body' and 'subject' has been switched
+        AppSearchSchema schema2 = new AppSearchSchema.Builder("Email")
+                .addProperty(new StringPropertyConfig.Builder("body")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).addProperty(new StringPropertyConfig.Builder("subject")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build()
+                ).build();
+        assertThat(schema1).isNotEqualTo(schema2);
+        assertThat(schema1.hashCode()).isNotEqualTo(schema2.hashCode());
+    }
+
+    @Test
+    public void testPropertyConfig() {
+        AppSearchSchema schema = new AppSearchSchema.Builder("Test")
+                .addProperty(new StringPropertyConfig.Builder("string")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("long")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .build())
+                .addProperty(new AppSearchSchema.DoublePropertyConfig.Builder("double")
+                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                        .build())
+                .addProperty(new AppSearchSchema.BooleanPropertyConfig.Builder("boolean")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .addProperty(new AppSearchSchema.BytesPropertyConfig.Builder("bytes")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .build())
+                .addProperty(new AppSearchSchema.DocumentPropertyConfig.Builder(
+                        "document", AppSearchEmail.SCHEMA_TYPE)
+                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                        .setShouldIndexNestedProperties(true)
+                        .build())
+                .build();
+
+        assertThat(schema.getSchemaType()).isEqualTo("Test");
+        List<PropertyConfig> properties = schema.getProperties();
+        assertThat(properties).hasSize(6);
+
+        assertThat(properties.get(0).getName()).isEqualTo("string");
+        assertThat(properties.get(0).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_REQUIRED);
+        assertThat(((StringPropertyConfig) properties.get(0)).getIndexingType())
+                .isEqualTo(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS);
+        assertThat(((StringPropertyConfig) properties.get(0)).getTokenizerType())
+                .isEqualTo(StringPropertyConfig.TOKENIZER_TYPE_PLAIN);
+
+        assertThat(properties.get(1).getName()).isEqualTo("long");
+        assertThat(properties.get(1).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_OPTIONAL);
+        assertThat(properties.get(1)).isInstanceOf(AppSearchSchema.LongPropertyConfig.class);
+
+        assertThat(properties.get(2).getName()).isEqualTo("double");
+        assertThat(properties.get(2).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_REPEATED);
+        assertThat(properties.get(2)).isInstanceOf(AppSearchSchema.DoublePropertyConfig.class);
+
+        assertThat(properties.get(3).getName()).isEqualTo("boolean");
+        assertThat(properties.get(3).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_REQUIRED);
+        assertThat(properties.get(3)).isInstanceOf(AppSearchSchema.BooleanPropertyConfig.class);
+
+        assertThat(properties.get(4).getName()).isEqualTo("bytes");
+        assertThat(properties.get(4).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_OPTIONAL);
+        assertThat(properties.get(4)).isInstanceOf(AppSearchSchema.BytesPropertyConfig.class);
+
+        assertThat(properties.get(5).getName()).isEqualTo("document");
+        assertThat(properties.get(5).getCardinality())
+                .isEqualTo(PropertyConfig.CARDINALITY_REPEATED);
+        assertThat(((AppSearchSchema.DocumentPropertyConfig) properties.get(5)).getSchemaType())
+                .isEqualTo(AppSearchEmail.SCHEMA_TYPE);
+        assertThat(((AppSearchSchema.DocumentPropertyConfig) properties.get(5))
+                .shouldIndexNestedProperties()).isEqualTo(true);
+    }
+
+    @Test
+    public void testInvalidStringPropertyConfigsTokenizerNone() {
+        // Everything should work fine with the defaults.
+        final StringPropertyConfig.Builder builder =
+                new StringPropertyConfig.Builder("property");
+        assertThat(builder.build()).isNotNull();
+
+        // Setting an indexing type other NONE with the default tokenizer type (NONE) should fail.
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        // Explicitly setting the default should work fine.
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_NONE);
+        assertThat(builder.build()).isNotNull();
+
+        // Explicitly setting the default tokenizer type should result in the same behavior.
+        builder.setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_NONE)
+                .setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_NONE);
+        assertThat(builder.build()).isNotNull();
+    }
+
+    @Test
+    public void testInvalidStringPropertyConfigsTokenizerPlain() {
+        // Setting indexing type to be NONE with tokenizer type PLAIN should fail. Regardless of
+        // whether NONE is set explicitly or just kept as default.
+        final StringPropertyConfig.Builder builder =
+                new StringPropertyConfig.Builder("property")
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_NONE);
+        assertThrows(IllegalStateException.class, () -> builder.build());
+
+        // Setting indexing type to be something other than NONE with tokenizer type PLAIN should
+        // be just fine.
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS);
+        assertThat(builder.build()).isNotNull();
+
+        builder.setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES);
+        assertThat(builder.build()).isNotNull();
+    }
+
+    @Test
+    public void testAppSearchSchema_toString() {
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new StringPropertyConfig.Builder("string1")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_NONE)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_NONE)
+                        .build())
+                .addProperty(new StringPropertyConfig.Builder("string2")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new StringPropertyConfig.Builder("string3")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("long")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .build())
+                .addProperty(new AppSearchSchema.DoublePropertyConfig.Builder("double")
+                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                        .build())
+                .addProperty(new AppSearchSchema.BooleanPropertyConfig.Builder("boolean")
+                        .setCardinality(PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .addProperty(new AppSearchSchema.BytesPropertyConfig.Builder("bytes")
+                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                        .build())
+                .addProperty(new AppSearchSchema.DocumentPropertyConfig.Builder(
+                        "document", AppSearchEmail.SCHEMA_TYPE)
+                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                        .setShouldIndexNestedProperties(true)
+                        .build())
+                .build();
+
+        String schemaString = schema.toString();
+
+        String expectedString = "{\n"
+                + "  schemaType: \"testSchema\",\n"
+                + "  properties: [\n"
+                + "    {\n"
+                + "      name: \"boolean\",\n"
+                + "      cardinality: CARDINALITY_REQUIRED,\n"
+                + "      dataType: DATA_TYPE_BOOLEAN,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"bytes\",\n"
+                + "      cardinality: CARDINALITY_OPTIONAL,\n"
+                + "      dataType: DATA_TYPE_BYTES,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"document\",\n"
+                + "      shouldIndexNestedProperties: true,\n"
+                + "      schemaType: \"builtin:Email\",\n"
+                + "      cardinality: CARDINALITY_REPEATED,\n"
+                + "      dataType: DATA_TYPE_DOCUMENT,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"double\",\n"
+                + "      cardinality: CARDINALITY_REPEATED,\n"
+                + "      dataType: DATA_TYPE_DOUBLE,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"long\",\n"
+                + "      cardinality: CARDINALITY_OPTIONAL,\n"
+                + "      dataType: DATA_TYPE_LONG,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"string1\",\n"
+                + "      indexingType: INDEXING_TYPE_NONE,\n"
+                + "      tokenizerType: TOKENIZER_TYPE_NONE,\n"
+                + "      cardinality: CARDINALITY_REQUIRED,\n"
+                + "      dataType: DATA_TYPE_STRING,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"string2\",\n"
+                + "      indexingType: INDEXING_TYPE_EXACT_TERMS,\n"
+                + "      tokenizerType: TOKENIZER_TYPE_PLAIN,\n"
+                + "      cardinality: CARDINALITY_REQUIRED,\n"
+                + "      dataType: DATA_TYPE_STRING,\n"
+                + "    },\n"
+                + "    {\n"
+                + "      name: \"string3\",\n"
+                + "      indexingType: INDEXING_TYPE_PREFIXES,\n"
+                + "      tokenizerType: TOKENIZER_TYPE_PLAIN,\n"
+                + "      cardinality: CARDINALITY_REQUIRED,\n"
+                + "      dataType: DATA_TYPE_STRING,\n"
+                + "    }\n"
+                + "  ]\n"
+                + "}";
+
+        assertThat(schemaString).isEqualTo(expectedString);
+    }
+}

diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaMigrationCtsTestBase.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaMigrationCtsTestBase.java
new file mode 100644
index 0000000..ddcae47
--- /dev/null
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/AppSearchSchemaMigrationCtsTestBase.java

@@ -0,0 +1,1406 @@
+/*
+ * 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.cts.app;
+
+import static androidx.appsearch.app.AppSearchResult.RESULT_NOT_FOUND;
+import static androidx.appsearch.app.util.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static androidx.appsearch.app.util.AppSearchTestUtils.convertSearchResultsToDocuments;
+import static androidx.appsearch.app.util.AppSearchTestUtils.doGet;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import androidx.annotation.NonNull;
+import androidx.appsearch.app.AppSearchBatchResult;
+import androidx.appsearch.app.AppSearchResult;
+import androidx.appsearch.app.AppSearchSchema;
+import androidx.appsearch.app.AppSearchSession;
+import androidx.appsearch.app.GenericDocument;
+import androidx.appsearch.app.Migrator;
+import androidx.appsearch.app.PutDocumentsRequest;
+import androidx.appsearch.app.SearchResults;
+import androidx.appsearch.app.SearchSpec;
+import androidx.appsearch.app.SetSchemaRequest;
+import androidx.appsearch.app.SetSchemaResponse;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/*
+ * For schema migration, we have 4 factors
+ * A. is ForceOverride set to true?
+ * B. is the schema change backwards compatible?
+ * C. is shouldTrigger return true?
+ * D. is there a migration triggered for each incompatible type and no deleted types?
+ * If B is true then D could never be false, so that will give us 12 combinations.
+ *
+ *                                Trigger       Delete      First            Second
+ * A      B       C       D       Migration     Types       SetSchema        SetSchema
+ * TRUE   TRUE    TRUE    TRUE    Yes                       succeeds         succeeds(noop)
+ * TRUE   TRUE    FALSE   TRUE                              succeeds         succeeds(noop)
+ * TRUE   FALSE   TRUE    TRUE    Yes                       fail             succeeds
+ * TRUE   FALSE   TRUE    FALSE   Yes           Yes         fail             succeeds
+ * TRUE   FALSE   FALSE   TRUE                  Yes         fail             succeeds
+ * TRUE   FALSE   FALSE   FALSE                 Yes         fail             succeeds
+ * FALSE  TRUE    TRUE    TRUE    Yes                       succeeds         succeeds(noop)
+ * FALSE  TRUE    FALSE   TRUE                              succeeds         succeeds(noop)
+ * FALSE  FALSE   TRUE    TRUE    Yes                       fail             succeeds
+ * FALSE  FALSE   TRUE    FALSE   Yes                       fail             throw error
+ * FALSE  FALSE   FALSE   TRUE    Impossible case, migrators are inactivity
+ * FALSE  FALSE   FALSE   FALSE                             fail             throw error
+ */
+public abstract class AppSearchSchemaMigrationCtsTestBase {
+
+    private static final String DB_NAME = "";
+    private static final long DOCUMENT_CREATION_TIME = 12345L;
+    private static final Migrator ACTIVE_NOOP_MIGRATOR = new Migrator() {
+        @Override
+        public boolean shouldMigrate(int currentVersion, int finalVersion) {
+            return true;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+    };
+    private static final Migrator INACTIVE_MIGRATOR = new Migrator() {
+        @Override
+        public boolean shouldMigrate(int currentVersion, int finalVersion) {
+            return false;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+    };
+
+    private AppSearchSession mDb;
+
+    protected abstract ListenableFuture<AppSearchSession> createSearchSession(
+            @NonNull String dbName);
+
+    @Before
+    public void setUp() throws Exception {
+        mDb = createSearchSession(DB_NAME).get();
+
+        // Cleanup whatever documents may still exist in these databases. This is needed in
+        // addition to tearDown in case a test exited without completing properly.
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).build()).get();
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id0", "testSchema")
+                .setPropertyString("subject", "testPut example1")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id0", null);
+        assertThat(result.getFailures()).isEmpty();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // Cleanup whatever documents may still exist in these databases.
+        mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_B_C_D() throws Exception {
+        // create a backwards compatible schema and update the version
+        AppSearchSchema B_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(B_C_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setForceOverride(true)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_B_NC_D() throws Exception {
+        // create a backwards compatible schema but don't update the version
+        AppSearchSchema B_NC_Schema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(B_NC_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setForceOverride(true)
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_NB_C_D() throws Exception {
+        // create a backwards incompatible schema and update the version
+        AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(NB_C_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setForceOverride(true)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_NB_C_ND() throws Exception {
+        // create a backwards incompatible schema and update the version
+        AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(NB_C_Schema)
+                        .setMigrator("testSchema", INACTIVE_MIGRATOR)  //ND
+                        .setForceOverride(true)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_NB_NC_D() throws Exception {
+        // create a backwards incompatible schema but don't update the version
+        AppSearchSchema NB_NC_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(NB_NC_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setForceOverride(true)
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_A_NB_NC_ND() throws Exception {
+        // create a backwards incompatible schema but don't update the version
+        AppSearchSchema $B_$C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas($B_$C_Schema)
+                        .setMigrator("testSchema", INACTIVE_MIGRATOR)  //ND
+                        .setForceOverride(true)
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_NA_B_C_D() throws Exception {
+        // create a backwards compatible schema and update the version
+        AppSearchSchema B_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(B_C_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_NA_B_NC_D() throws Exception {
+        // create a backwards compatible schema but don't update the version
+        AppSearchSchema B_NC_Schema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(B_NC_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setForceOverride(true)
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_NA_NB_C_D() throws Exception {
+        // create a backwards incompatible schema and update the version
+        AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        mDb.setSchema(
+                new SetSchemaRequest.Builder().addSchemas(NB_C_Schema)
+                        .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+    }
+
+    @Test
+    public void testSchemaMigration_NA_NB_C_ND() throws Exception {
+        // create a backwards incompatible schema and update the version
+        AppSearchSchema $B_C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(
+                        new SetSchemaRequest.Builder().addSchemas($B_C_Schema)
+                                .setMigrator("testSchema", INACTIVE_MIGRATOR)  //ND
+                                .setVersion(2)     // upgrade version
+                                .build()).get());
+        assertThat(exception).hasMessageThat().contains("Schema is incompatible.");
+    }
+
+    @Test
+    public void testSchemaMigration_NA_NB_NC_ND() throws Exception {
+        // create a backwards incompatible schema but don't update the version
+        AppSearchSchema $B_$C_Schema = new AppSearchSchema.Builder("testSchema")
+                .build();
+
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(
+                        new SetSchemaRequest.Builder().addSchemas($B_$C_Schema)
+                                .setMigrator("testSchema", INACTIVE_MIGRATOR)  //ND
+                                .build()).get());
+        assertThat(exception).hasMessageThat().contains("Schema is incompatible.");
+    }
+
+    @Test
+    public void testSchemaMigration() throws Exception {
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("To")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).build()).get();
+
+        GenericDocument doc1 = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1")
+                .setPropertyString("To", "testTo example1")
+                .build();
+        GenericDocument doc2 = new GenericDocument.Builder<>("namespace", "id2", "testSchema")
+                .setPropertyString("subject", "testPut example2")
+                .setPropertyString("To", "testTo example2")
+                .build();
+
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc1, doc2).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null, "id2", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create new schema type and upgrade the version number
+        AppSearchSchema newSchema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        // set the new schema to AppSearch, the first document will be migrated successfully but the
+        // second one will be failed.
+
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return currentVersion != finalVersion;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                if (document.getId().equals("id2")) {
+                    return new GenericDocument.Builder<>(document.getNamespace(), document.getId(),
+                            document.getSchemaType())
+                            .setPropertyString("subject", "testPut example2")
+                            .setPropertyString("to",
+                                    "Expect to fail, property not in the schema")
+                            .build();
+                }
+                return new GenericDocument.Builder<>(document.getNamespace(), document.getId(),
+                        document.getSchemaType())
+                        .setPropertyString("subject", "testPut example1 migrated")
+                        .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                        .build();
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Downgrade should not be triggered for this test");
+            }
+        };
+
+        SetSchemaResponse setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(newSchema)
+                        .setMigrator("testSchema", migrator)
+                        .setVersion(2)     // upgrade version
+                        .build()).get();
+
+        // Check the schema has been saved
+        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+
+        assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
+        assertThat(setSchemaResponse.getIncompatibleTypes())
+                .containsExactly("testSchema");
+        assertThat(setSchemaResponse.getMigratedTypes())
+                .containsExactly("testSchema");
+
+        // Check migrate the first document is success
+        GenericDocument expected = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1 migrated")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id1")).containsExactly(expected);
+
+        // Check migrate the second document is fail.
+        assertThat(setSchemaResponse.getMigrationFailures()).hasSize(1);
+        SetSchemaResponse.MigrationFailure migrationFailure =
+                setSchemaResponse.getMigrationFailures().get(0);
+        assertThat(migrationFailure.getNamespace()).isEqualTo("namespace");
+        assertThat(migrationFailure.getSchemaType()).isEqualTo("testSchema");
+        assertThat(migrationFailure.getDocumentId()).isEqualTo("id2");
+
+        AppSearchResult<Void> actualResult = migrationFailure.getAppSearchResult();
+        assertThat(actualResult.isSuccess()).isFalse();
+        assertThat(actualResult.getResultCode()).isEqualTo(RESULT_NOT_FOUND);
+        assertThat(actualResult.getErrorMessage())
+                .contains("Property config 'to' not found for key");
+    }
+
+    @Test
+    public void testSchemaMigration_downgrade() throws Exception {
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("To")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).setVersion(3).build()).get();
+
+        GenericDocument doc1 = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1")
+                .setPropertyString("To", "testTo example1")
+                .build();
+
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc1).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create new schema type and upgrade the version number
+        AppSearchSchema newSchema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        // set the new schema to AppSearch
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return currentVersion != finalVersion;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Upgrade should not be triggered for this test");
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return new GenericDocument.Builder<>(document.getNamespace(), document.getId(),
+                        document.getSchemaType())
+                        .setPropertyString("subject", "testPut example1 migrated")
+                        .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                        .build();
+            }
+        };
+
+        SetSchemaResponse setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(newSchema)
+                        .setMigrator("testSchema", migrator)
+                        .setVersion(1)     // downgrade version
+                        .build()).get();
+
+        // Check the schema has been saved
+        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+
+        assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
+        assertThat(setSchemaResponse.getIncompatibleTypes())
+                .containsExactly("testSchema");
+        assertThat(setSchemaResponse.getMigratedTypes())
+                .containsExactly("testSchema");
+
+        // Check migrate is success
+        GenericDocument expected = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1 migrated")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id1")).containsExactly(expected);
+    }
+
+    @Test
+    public void testSchemaMigration_sameVersion() throws Exception {
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("To")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).setVersion(3).build()).get();
+
+        GenericDocument doc1 = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1")
+                .setPropertyString("To", "testTo example1")
+                .build();
+
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc1).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create new schema type with the same version number
+        AppSearchSchema newSchema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        // set the new schema to AppSearch
+        Migrator migrator = new Migrator() {
+
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return currentVersion != finalVersion;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Upgrade should not be triggered for this test");
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Downgrade should not be triggered for this test");
+            }
+        };
+
+        // SetSchema with forceOverride=false
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(newSchema)
+                        .setMigrator("testSchema", migrator)
+                        .setVersion(3)     // same version
+                        .build()).get());
+        assertThat(exception).hasMessageThat().contains("Schema is incompatible.");
+
+        // SetSchema with forceOverride=true
+        SetSchemaResponse setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(newSchema)
+                        .setMigrator("testSchema", migrator)
+                        .setVersion(3)     // same version
+                        .setForceOverride(true).build()).get();
+
+        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+
+        assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
+        assertThat(setSchemaResponse.getIncompatibleTypes())
+                .containsExactly("testSchema");
+        assertThat(setSchemaResponse.getMigratedTypes()).isEmpty();
+
+    }
+
+    @Test
+    public void testSchemaMigration_noMigration() throws Exception {
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("To")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).setVersion(2).build()).get();
+
+        GenericDocument doc1 = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyString("subject", "testPut example1")
+                .setPropertyString("To", "testTo example1")
+                .build();
+
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc1).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create new schema type and upgrade the version number
+        AppSearchSchema newSchema = new AppSearchSchema.Builder("testSchema")
+                .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();
+
+        // Set start version to be 3 means we won't trigger migration for 2.
+        Migrator migrator = new Migrator() {
+
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return currentVersion > 2 && currentVersion != finalVersion;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Upgrade should not be triggered for this test");
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                throw new IllegalStateException("Downgrade should not be triggered for this test");
+            }
+        };
+
+        // SetSchema with forceOverride=false
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(newSchema)
+                        .setMigrator("testSchema", migrator)
+                        .setVersion(4)     // upgrade version
+                        .build()).get());
+        assertThat(exception).hasMessageThat().contains("Schema is incompatible.");
+    }
+
+    @Test
+    public void testSchemaMigration_sourceToNowhere() throws Exception {
+        // set the source schema to AppSearch
+        AppSearchSchema schema = new AppSearchSchema.Builder("sourceSchema")
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema).setForceOverride(true).build()).get();
+
+        // save a doc to the source type
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id1", "sourceSchema")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        Migrator migrator_sourceToNowhere = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return new GenericDocument.Builder<>(
+                        "zombieNamespace", "zombieId", "nonExistSchema")
+                        .build();
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        // SetSchema with forceOverride=false
+        // Source type exist, destination type doesn't exist.
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(new SetSchemaRequest.Builder()
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("sourceSchema", migrator_sourceToNowhere)
+                        .setVersion(2).build())   // upgrade version
+                        .get());
+        assertThat(exception).hasMessageThat().contains(
+                "Receive a migrated document with schema type: nonExistSchema. "
+                        + "But the schema types doesn't exist in the request");
+
+        // SetSchema with forceOverride=true
+        // Source type exist, destination type doesn't exist.
+        exception = assertThrows(ExecutionException.class,
+                () -> mDb.setSchema(new SetSchemaRequest.Builder()
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("sourceSchema", migrator_sourceToNowhere)
+                        .setForceOverride(true)
+                        .setVersion(2).build())   // upgrade version
+                        .get());
+        assertThat(exception).hasMessageThat().contains(
+                "Receive a migrated document with schema type: nonExistSchema. "
+                        + "But the schema types doesn't exist in the request");
+    }
+
+    @Test
+    public void testSchemaMigration_nowhereToDestination() throws Exception {
+        // set the destination schema to AppSearch
+        AppSearchSchema destinationSchema =
+                new AppSearchSchema.Builder("destinationSchema").build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(destinationSchema).setForceOverride(true).build()).get();
+
+        Migrator migrator_nowhereToDestination = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+
+        // Source type doesn't exist, destination type exist. Since source type doesn't exist,
+        // no matter force override or not, the migrator won't be invoked
+        // SetSchema with forceOverride=false
+        SetSchemaResponse setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(destinationSchema)
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("nonExistSchema", migrator_nowhereToDestination)
+                        .setVersion(2) //  upgrade version
+                        .build()).get();
+        assertThat(setSchemaResponse.getMigratedTypes()).isEmpty();
+
+        // SetSchema with forceOverride=true
+        setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(destinationSchema)
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("nonExistSchema", migrator_nowhereToDestination)
+                        .setVersion(2) //  upgrade version
+                        .setForceOverride(true).build()).get();
+        assertThat(setSchemaResponse.getMigratedTypes()).isEmpty();
+    }
+
+    @Test
+    public void testSchemaMigration_nowhereToNowhere() throws Exception {
+        // set empty schema
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .setForceOverride(true).build()).get();
+        Migrator migrator_nowhereToNowhere = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+
+        // Source type doesn't exist, destination type exist. Since source type doesn't exist,
+        // no matter force override or not, the migrator won't be invoked
+        // SetSchema with forceOverride=false
+        SetSchemaResponse setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder()
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("nonExistSchema", migrator_nowhereToNowhere)
+                        .setVersion(2)  //  upgrade version
+                        .build()).get();
+        assertThat(setSchemaResponse.getMigratedTypes()).isEmpty();
+
+        // SetSchema with forceOverride=true
+        setSchemaResponse =
+                mDb.setSchema(new SetSchemaRequest.Builder()
+                        .addSchemas(new AppSearchSchema.Builder("emptySchema").build())
+                        .setMigrator("nonExistSchema", migrator_nowhereToNowhere)
+                        .setVersion(2) //  upgrade version
+                        .setForceOverride(true).build()).get();
+        assertThat(setSchemaResponse.getMigratedTypes()).isEmpty();
+    }
+
+    @Test
+    public void testSchemaMigration_toAnotherType() throws Exception {
+        // set the source schema to AppSearch
+        AppSearchSchema sourceSchema = new AppSearchSchema.Builder("sourceSchema")
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(sourceSchema).setForceOverride(true).build()).get();
+
+        // save a doc to the source type
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id1", "sourceSchema").build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create the destination type and migrator
+        AppSearchSchema destinationSchema = new AppSearchSchema.Builder("destinationSchema")
+                .build();
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return new GenericDocument.Builder<>("namespace",
+                        document.getId(),
+                        "destinationSchema")
+                        .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                        .build();
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        // SetSchema with forceOverride=false and increase overall version
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(destinationSchema)
+                .setMigrator("sourceSchema", migrator)
+                .setForceOverride(false)
+                .setVersion(2) //  upgrade version
+                .build()).get();
+        assertThat(setSchemaResponse.getDeletedTypes())
+                .containsExactly("sourceSchema");
+        assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
+        assertThat(setSchemaResponse.getMigratedTypes())
+                .containsExactly("sourceSchema");
+
+        // Check successfully migrate the doc to the destination type
+        GenericDocument expected = new GenericDocument.Builder<>(
+                "namespace", "id1", "destinationSchema")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id1")).containsExactly(expected);
+    }
+
+    @Test
+    public void testSchemaMigration_toMultipleDestinationType() throws Exception {
+        // set the source schema to AppSearch
+        AppSearchSchema sourceSchema = new AppSearchSchema.Builder("Person")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("Age")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(sourceSchema).setForceOverride(true).build()).get();
+
+        // save a child and an adult to the Person type
+        GenericDocument childDoc = new GenericDocument.Builder<>(
+                "namespace", "Person1", "Person")
+                .setPropertyLong("Age", 6).build();
+        GenericDocument adultDoc = new GenericDocument.Builder<>(
+                "namespace", "Person2", "Person")
+                .setPropertyLong("Age", 36).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(childDoc, adultDoc).build()));
+        assertThat(result.getSuccesses()).containsExactly("Person1", null, "Person2", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // create the migrator
+        Migrator migrator = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                if (document.getPropertyLong("Age") < 21) {
+                    return new GenericDocument.Builder<>(
+                            "namespace", "child-id", "Child")
+                            .setPropertyLong("Age", document.getPropertyLong("Age"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                } else {
+                    return new GenericDocument.Builder<>(
+                            "namespace", "adult-id", "Adult")
+                            .setPropertyLong("Age", document.getPropertyLong("Age"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                }
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        // create adult and child schema
+        AppSearchSchema adultSchema = new AppSearchSchema.Builder("Adult")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("Age")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        AppSearchSchema childSchema = new AppSearchSchema.Builder("Child")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("Age")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+
+        // SetSchema with forceOverride=false and increase overall version
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(adultSchema, childSchema)
+                .setMigrator("Person", migrator)
+                .setForceOverride(false)
+                .setVersion(2) //  upgrade version
+                .build()).get();
+        assertThat(setSchemaResponse.getDeletedTypes())
+                .containsExactly("Person");
+        assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
+        assertThat(setSchemaResponse.getMigratedTypes())
+                .containsExactly("Person");
+
+        // Check successfully migrate the child doc
+        GenericDocument expectedInChild = new GenericDocument.Builder<>(
+                "namespace", "child-id", "Child")
+                .setPropertyLong("Age", 6)
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "child-id"))
+                .containsExactly(expectedInChild);
+
+        // Check successfully migrate the adult doc
+        GenericDocument expectedInAdult = new GenericDocument.Builder<>(
+                "namespace", "adult-id", "Adult")
+                .setPropertyLong("Age", 36)
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "adult-id"))
+                .containsExactly(expectedInAdult);
+    }
+
+    @Test
+    public void testSchemaMigration_loadTest() throws Exception {
+        // set the two source type A & B to AppSearch
+        AppSearchSchema sourceSchemaA = new AppSearchSchema.Builder("schemaA")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("num")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        AppSearchSchema sourceSchemaB = new AppSearchSchema.Builder("schemaB")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("num")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(sourceSchemaA, sourceSchemaB).setForceOverride(true).build()).get();
+
+        // save 100 docs to each type
+        PutDocumentsRequest.Builder putRequestBuilder = new PutDocumentsRequest.Builder();
+        for (int i = 0; i < 100; i++) {
+            GenericDocument docInA = new GenericDocument.Builder<>(
+                    "namespace", "idA-" + i, "schemaA")
+                    .setPropertyLong("num", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            GenericDocument docInB = new GenericDocument.Builder<>(
+                    "namespace", "idB-" + i, "schemaB")
+                    .setPropertyLong("num", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            putRequestBuilder.addGenericDocuments(docInA, docInB);
+        }
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                putRequestBuilder.build()));
+        assertThat(result.getFailures()).isEmpty();
+
+        // create three destination types B, C & D
+        AppSearchSchema destinationSchemaB = new AppSearchSchema.Builder("schemaB")
+                .addProperty(
+                        new AppSearchSchema.LongPropertyConfig.Builder("numNewProperty")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        AppSearchSchema destinationSchemaC = new AppSearchSchema.Builder("schemaC")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("num")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+        AppSearchSchema destinationSchemaD = new AppSearchSchema.Builder("schemaD")
+                .addProperty(new AppSearchSchema.LongPropertyConfig.Builder("num")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .build())
+                .build();
+
+        // Create an active migrator for type A which will migrate first 50 docs to C and second
+        // 50 docs to D
+        Migrator migratorA = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                if (document.getPropertyLong("num") < 50) {
+                    return new GenericDocument.Builder<>("namespace",
+                            document.getId() + "-destC", "schemaC")
+                            .setPropertyLong("num", document.getPropertyLong("num"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                } else {
+                    return new GenericDocument.Builder<>("namespace",
+                            document.getId() + "-destD", "schemaD")
+                            .setPropertyLong("num", document.getPropertyLong("num"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                }
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        // Create an active migrator for type B which will migrate first 50 docs to B and second
+        // 50 docs to D
+        Migrator migratorB = new Migrator() {
+            @Override
+            public boolean shouldMigrate(int currentVersion, int finalVersion) {
+                return true;
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                if (document.getPropertyLong("num") < 50) {
+                    return new GenericDocument.Builder<>("namespace",
+                            document.getId() + "-destB", "schemaB")
+                            .setPropertyLong("numNewProperty",
+                                    document.getPropertyLong("num"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                } else {
+                    return new GenericDocument.Builder<>("namespace",
+                            document.getId() + "-destD", "schemaD")
+                            .setPropertyLong("num", document.getPropertyLong("num"))
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                            .build();
+                }
+            }
+
+            @NonNull
+            @Override
+            public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                    @NonNull GenericDocument document) {
+                return document;
+            }
+        };
+
+        // SetSchema with forceOverride=false and increase overall version
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(destinationSchemaB, destinationSchemaC, destinationSchemaD)
+                .setMigrator("schemaA", migratorA)
+                .setMigrator("schemaB", migratorB)
+                .setForceOverride(false)
+                .setVersion(2)    // upgrade version
+                .build()).get();
+        assertThat(setSchemaResponse.getDeletedTypes())
+                .containsExactly("schemaA");
+        assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("schemaB");
+        assertThat(setSchemaResponse.getMigratedTypes())
+                .containsExactly("schemaA", "schemaB");
+
+        // generate expected documents
+        List<GenericDocument> expectedDocs = new ArrayList<>();
+        for (int i = 0; i < 50; i++) {
+            GenericDocument docAToC = new GenericDocument.Builder<>(
+                    "namespace", "idA-" + i + "-destC", "schemaC")
+                    .setPropertyLong("num", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            GenericDocument docBToB = new GenericDocument.Builder<>(
+                    "namespace", "idB-" + i + "-destB", "schemaB")
+                    .setPropertyLong("numNewProperty", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            expectedDocs.add(docAToC);
+            expectedDocs.add(docBToB);
+        }
+
+        for (int i = 50; i < 100; i++) {
+            GenericDocument docAToD = new GenericDocument.Builder<>(
+                    "namespace", "idA-" + i + "-destD", "schemaD")
+                    .setPropertyLong("num", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            GenericDocument docBToD = new GenericDocument.Builder<>(
+                    "namespace", "idB-" + i + "-destD", "schemaD")
+                    .setPropertyLong("num", i)
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+            expectedDocs.add(docAToD);
+            expectedDocs.add(docBToD);
+        }
+        //query all documents and compare
+        SearchResults searchResults = mDb.search("", new SearchSpec.Builder()
+                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
+                .build());
+        List<GenericDocument> documents = convertSearchResultsToDocuments(searchResults);
+        assertThat(documents).containsExactlyElementsIn(expectedDocs);
+    }
+
+    //*************************** Multi-step migration tests   ******************************
+    // Version structure and how version bumps:
+    // Version 1: Start - typeA docs contains "subject" property.
+    // Version 2: typeA docs get new "body" property, contains "subject" and "body" now.
+    // Version 3: typeA docs is migrated to typeB, typeA docs got removed, typeB doc contains
+    //            "subject" and "body" property.
+    // Version 4: typeB docs remove "subject" property, contains only "body" now.
+
+    // Create a multi-step migrator for A, which could migrate version 1-3 to 4.
+    private static final Migrator MULTI_STEP_MIGRATOR_A = new Migrator() {
+        @Override
+        public boolean shouldMigrate(int currentVersion, int finalVersion) {
+            return currentVersion < 3;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            GenericDocument.Builder docBuilder =
+                    new GenericDocument.Builder<>("namespace", "id", "TypeB")
+                            .setCreationTimestampMillis(DOCUMENT_CREATION_TIME);
+            if (currentVersion == 2) {
+                docBuilder.setPropertyString("body", document.getPropertyString("body"));
+            } else {
+                docBuilder.setPropertyString("body",
+                        "new content for the newly added 'body' property");
+            }
+            return docBuilder.build();
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+    };
+
+    // create a multi-step migrator for B, which could migrate version 1-3 to 4.
+    private static final Migrator MULTI_STEP_MIGRATOR_B = new Migrator() {
+        @Override
+        public boolean shouldMigrate(int currentVersion, int finalVersion) {
+            return currentVersion == 3;
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onUpgrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return new GenericDocument.Builder<>("namespace", "id", "TypeB")
+                    .setPropertyString("body", document.getPropertyString("body"))
+                    .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                    .build();
+        }
+
+        @NonNull
+        @Override
+        public GenericDocument onDowngrade(int currentVersion, int finalVersion,
+                @NonNull GenericDocument document) {
+            return document;
+        }
+    };
+
+    // create a setSchemaRequest, which could migrate version 1-3 to 4.
+    private static final SetSchemaRequest MULTI_STEP_REQUEST = new SetSchemaRequest.Builder()
+            .addSchemas(new AppSearchSchema.Builder("TypeB")
+                    .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("body")
+                            .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                            .setIndexingType(
+                                    AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                            .setTokenizerType(
+                                    AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                            .build())
+                    .build())
+            .setMigrator("TypeA", MULTI_STEP_MIGRATOR_A)
+            .setMigrator("TypeB", MULTI_STEP_MIGRATOR_B)
+            .setVersion(4)
+            .build();
+
+    @Test
+    public void testSchemaMigration_multiStep1To4() throws Exception {
+        // set version 1 to the database, only contain TypeA
+        AppSearchSchema typeA = new AppSearchSchema.Builder("TypeA")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(typeA).setForceOverride(true).setVersion(1).build()).get();
+
+        // save a doc to version 1.
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeA")
+                .setPropertyString("subject", "subject")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // update to version 4.
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        assertThat(setSchemaResponse.getDeletedTypes()).containsExactly("TypeA");
+        assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
+        assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeA");
+
+        // Create expected doc. Since we started at version 1 and migrated to version 4:
+        // 1: A 'body' property should have been added with "new content for the newly added 'body'
+        //    property"
+        // 2: The type should have been changed from 'TypeA' to 'TypeB'
+        // 3: The 'subject' property should have been removed
+        GenericDocument expected = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeB")
+                .setPropertyString("body", "new content for the newly added 'body' property")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id")).containsExactly(expected);
+    }
+
+    @Test
+    public void testSchemaMigration_multiStep2To4() throws Exception {
+        // set version 2 to the database, only contain TypeA with a new property
+        AppSearchSchema typeA = new AppSearchSchema.Builder("TypeA")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("body")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(typeA).setForceOverride(true).setVersion(2).build()).get();
+
+        // save a doc to version 2.
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeA")
+                .setPropertyString("subject", "subject")
+                .setPropertyString("body", "bodyFromA")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // update to version 4.
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        assertThat(setSchemaResponse.getDeletedTypes()).containsExactly("TypeA");
+        assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
+        assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeA");
+
+        // create expected doc, body exists in type A of version 2
+        GenericDocument expected = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeB")
+                .setPropertyString("body", "bodyFromA")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id")).containsExactly(expected);
+    }
+
+    @Test
+    public void testSchemaMigration_multiStep3To4() throws Exception {
+        // set version 3 to the database, only contain TypeB
+        AppSearchSchema typeA = new AppSearchSchema.Builder("TypeB")
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("body")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                        .setIndexingType(
+                                AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                        .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(typeA).setForceOverride(true).setVersion(3).build()).get();
+
+        // save a doc to version 2.
+        GenericDocument doc = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeB")
+                .setPropertyString("subject", "subject")
+                .setPropertyString("body", "bodyFromB")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME).build();
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(doc).build()));
+        assertThat(result.getSuccesses()).containsExactly("id", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        // update to version 4.
+        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
+        assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("TypeB");
+        assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeB");
+
+        // create expected doc, body exists in type A of version 3
+        GenericDocument expected = new GenericDocument.Builder<>(
+                "namespace", "id", "TypeB")
+                .setPropertyString("body", "bodyFromB")
+                .setCreationTimestampMillis(DOCUMENT_CREATION_TIME)
+                .build();
+        assertThat(doGet(mDb, "namespace", "id")).containsExactly(expected);
+    }
+}