Merge "Fix improper destination nesting with deep links" into androidx-main

diff --git a/annotation/annotation/api/current.txt b/annotation/annotation/api/current.txt
index 5d3123f..fcc1fa2 100644
--- a/annotation/annotation/api/current.txt
+++ b/annotation/annotation/api/current.txt

@@ -51,6 +51,13 @@
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface ContentView {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface DeprecatedSinceApi {
+    method public abstract int api();
+    method public abstract String message() default "";
+    property public abstract int api;
+    property public abstract String message;
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DimenRes {
   }
 
@@ -74,6 +81,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EmptySuper {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
@@ -177,6 +187,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.PACKAGE}) public @interface Nullable {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface OpenForTesting {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface PluralsRes {
   }
 
@@ -225,6 +238,9 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReturnThis {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;

diff --git a/annotation/annotation/api/public_plus_experimental_current.txt b/annotation/annotation/api/public_plus_experimental_current.txt
index 5d3123f..fcc1fa2 100644
--- a/annotation/annotation/api/public_plus_experimental_current.txt
+++ b/annotation/annotation/api/public_plus_experimental_current.txt

@@ -51,6 +51,13 @@
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface ContentView {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface DeprecatedSinceApi {
+    method public abstract int api();
+    method public abstract String message() default "";
+    property public abstract int api;
+    property public abstract String message;
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DimenRes {
   }
 
@@ -74,6 +81,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EmptySuper {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
@@ -177,6 +187,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.PACKAGE}) public @interface Nullable {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface OpenForTesting {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface PluralsRes {
   }
 
@@ -225,6 +238,9 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReturnThis {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;

diff --git a/annotation/annotation/api/restricted_current.txt b/annotation/annotation/api/restricted_current.txt
index 5d3123f..fcc1fa2 100644
--- a/annotation/annotation/api/restricted_current.txt
+++ b/annotation/annotation/api/restricted_current.txt

@@ -51,6 +51,13 @@
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface ContentView {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface DeprecatedSinceApi {
+    method public abstract int api();
+    method public abstract String message() default "";
+    property public abstract int api;
+    property public abstract String message;
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DimenRes {
   }
 
@@ -74,6 +81,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public @interface EmptySuper {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
@@ -177,6 +187,9 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.PACKAGE}) public @interface Nullable {
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface OpenForTesting {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface PluralsRes {
   }
 
@@ -225,6 +238,9 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface ReturnThis {
+  }
+
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;

diff --git a/annotation/annotation/src/main/java/androidx/annotation/DeprecatedSinceApi.kt b/annotation/annotation/src/main/java/androidx/annotation/DeprecatedSinceApi.kt
new file mode 100644
index 0000000..b8bb279
--- /dev/null
+++ b/annotation/annotation/src/main/java/androidx/annotation/DeprecatedSinceApi.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 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.annotation
+
+import kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS
+import kotlin.annotation.AnnotationTarget.CLASS
+import kotlin.annotation.AnnotationTarget.CONSTRUCTOR
+import kotlin.annotation.AnnotationTarget.FUNCTION
+import kotlin.annotation.AnnotationTarget.PROPERTY_GETTER
+import kotlin.annotation.AnnotationTarget.PROPERTY_SETTER
+
+/**
+ * Denotes that this API is only useful until the given API level; after that,
+ * a more suitable platform API is available.
+ */
+@MustBeDocumented
+@Retention(AnnotationRetention.BINARY)
+@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, ANNOTATION_CLASS, CLASS, CONSTRUCTOR)
+public annotation class DeprecatedSinceApi(
+    /** The API level where it is deprecated. */
+    val api: Int,
+    /** Suggested replacement. */
+    val message: String = ""
+)

diff --git a/annotation/annotation/src/main/java/androidx/annotation/EmptySuper.kt b/annotation/annotation/src/main/java/androidx/annotation/EmptySuper.kt
new file mode 100644
index 0000000..bef5c74
--- /dev/null
+++ b/annotation/annotation/src/main/java/androidx/annotation/EmptySuper.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.annotation
+
+import kotlin.annotation.AnnotationTarget.FUNCTION
+
+/**
+ * Denotes that any overriding methods should **not** invoke this method, since it is defined
+ * to be empty (or perhaps contain other code not intended to be run when overridden).
+ *
+ * Example:
+ * ```
+ * @EmptySuper
+ * public void onFocus() { }
+ * ```
+ */
+@MustBeDocumented
+@Retention(AnnotationRetention.BINARY)
+@Target(FUNCTION)
+public annotation class EmptySuper

diff --git a/annotation/annotation/src/main/java/androidx/annotation/OpenForTesting.kt b/annotation/annotation/src/main/java/androidx/annotation/OpenForTesting.kt
new file mode 100644
index 0000000..6134b85
--- /dev/null
+++ b/annotation/annotation/src/main/java/androidx/annotation/OpenForTesting.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 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.annotation
+
+import kotlin.annotation.AnnotationRetention.BINARY
+import kotlin.annotation.AnnotationTarget.CLASS
+import kotlin.annotation.AnnotationTarget.FUNCTION
+import kotlin.annotation.AnnotationTarget.PROPERTY_GETTER
+import kotlin.annotation.AnnotationTarget.PROPERTY_SETTER
+
+/**
+ * Denotes that this class or method is only `open` to allow unit testing.
+ * Any subclass or override is only allowed from tests.
+ */
+@MustBeDocumented
+@Retention(BINARY)
+@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, CLASS)
+public annotation class OpenForTesting

diff --git a/annotation/annotation/src/main/java/androidx/annotation/ReturnThis.kt b/annotation/annotation/src/main/java/androidx/annotation/ReturnThis.kt
new file mode 100644
index 0000000..bd8feca
--- /dev/null
+++ b/annotation/annotation/src/main/java/androidx/annotation/ReturnThis.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.annotation
+
+import kotlin.annotation.AnnotationTarget.CLASS
+import kotlin.annotation.AnnotationTarget.FUNCTION
+
+/**
+ * Denotes that any overriding methods should `return this`.
+ */
+@MustBeDocumented
+@Retention(AnnotationRetention.BINARY)
+@Target(FUNCTION, CLASS)
+public annotation class ReturnThis

diff --git a/appsearch/appsearch-builtin-types/api/current.txt b/appsearch/appsearch-builtin-types/api/current.txt
index e387d30..364c227 100644
--- a/appsearch/appsearch-builtin-types/api/current.txt
+++ b/appsearch/appsearch-builtin-types/api/current.txt

@@ -12,11 +12,13 @@
 
 package androidx.appsearch.builtintypes {
 
-  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public class Alarm {
-    method public long getBlackoutEndTimeMillis();
-    method public long getBlackoutStartTimeMillis();
+  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public final class Alarm {
+    method public String? getBlackoutPeriodEndDate();
+    method public String? getBlackoutPeriodStartDate();
     method public long getCreationTimestampMillis();
     method public int[]? getDaysOfWeek();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method @IntRange(from=0, to=23) public int getHour();
     method public String getId();
     method @IntRange(from=0, to=59) public int getMinute();
@@ -25,20 +27,20 @@
     method public androidx.appsearch.builtintypes.AlarmInstance? getNextInstance();
     method public androidx.appsearch.builtintypes.AlarmInstance? getPreviousInstance();
     method public String? getRingtone();
-    method public int getScore();
-    method public long getTtlMillis();
     method public boolean isEnabled();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
   }
 
   public static final class Alarm.Builder {
     ctor public Alarm.Builder(String, String);
     ctor public Alarm.Builder(androidx.appsearch.builtintypes.Alarm);
     method public androidx.appsearch.builtintypes.Alarm build();
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutEndTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutStartTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodEndDate(String?);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodStartDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setDaysOfWeek(@IntRange(from=java.util.Calendar.SUNDAY, to=java.util.Calendar.SATURDAY) int...);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setEnabled(boolean);
     method public androidx.appsearch.builtintypes.Alarm.Builder setHour(@IntRange(from=0, to=23) int);
     method public androidx.appsearch.builtintypes.Alarm.Builder setMinute(@IntRange(from=0, to=59) int);
@@ -46,24 +48,18 @@
     method public androidx.appsearch.builtintypes.Alarm.Builder setNextInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setPreviousInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setShouldVibrate(boolean);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public class AlarmInstance {
+  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public final class AlarmInstance {
     method public long getCreationTimestampMillis();
-    method @IntRange(from=1, to=31) public int getDay();
-    method @IntRange(from=0, to=23) public int getHour();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public String getId();
-    method @IntRange(from=0, to=59) public int getMinute();
-    method @IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) public int getMonth();
     method public String getNamespace();
-    method public int getScore();
+    method public String getScheduledTime();
     method public long getSnoozeDurationMillis();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public int getYear();
     field public static final int STATUS_DISMISSED = 3; // 0x3
     field public static final int STATUS_FIRING = 2; // 0x2
     field public static final int STATUS_MISSED = 5; // 0x5
@@ -73,35 +69,34 @@
   }
 
   public static final class AlarmInstance.Builder {
-    ctor public AlarmInstance.Builder(String, String);
+    ctor public AlarmInstance.Builder(String, String, String);
     ctor public AlarmInstance.Builder(androidx.appsearch.builtintypes.AlarmInstance);
     method public androidx.appsearch.builtintypes.AlarmInstance build();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setCreationTimestampMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDay(@IntRange(from=1, to=31) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setHour(@IntRange(from=0, to=23) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMinute(@IntRange(from=0, to=59) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMonth(@IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setSnoozeDurationMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setYear(int);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:Timer") public class Timer {
+  @androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
+    method public int getBootCount();
     method public long getCreationTimestampMillis();
+    method public long getCurrentRemainingTime(android.content.Context);
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public long getDurationMillis();
+    method public long getExpirationTimeMillis(android.content.Context);
     method public String getId();
     method public String? getName();
     method public String getNamespace();
-    method public long getRemainingTimeMillis();
+    method public long getOriginalDurationMillis();
+    method public long getRemainingTimeMillisSinceUpdate();
     method public String? getRingtone();
-    method public int getScore();
     method public long getStartTimeMillis();
     method public long getStartTimeMillisInElapsedRealtime();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
     field public static final int STATUS_EXPIRED = 3; // 0x3
     field public static final int STATUS_MISSED = 4; // 0x4
     field public static final int STATUS_PAUSED = 2; // 0x2
@@ -115,16 +110,17 @@
     ctor public Timer.Builder(androidx.appsearch.builtintypes.Timer);
     method public androidx.appsearch.builtintypes.Timer build();
     method public androidx.appsearch.builtintypes.Timer.Builder setCreationTimestampMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillisSinceUpdate(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillisInElapsedRealtime(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long, long, int);
+    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Timer.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setVibrate(boolean);
   }
 
 }

diff --git a/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt b/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt
index e387d30..364c227 100644
--- a/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt
+++ b/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt

@@ -12,11 +12,13 @@
 
 package androidx.appsearch.builtintypes {
 
-  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public class Alarm {
-    method public long getBlackoutEndTimeMillis();
-    method public long getBlackoutStartTimeMillis();
+  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public final class Alarm {
+    method public String? getBlackoutPeriodEndDate();
+    method public String? getBlackoutPeriodStartDate();
     method public long getCreationTimestampMillis();
     method public int[]? getDaysOfWeek();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method @IntRange(from=0, to=23) public int getHour();
     method public String getId();
     method @IntRange(from=0, to=59) public int getMinute();
@@ -25,20 +27,20 @@
     method public androidx.appsearch.builtintypes.AlarmInstance? getNextInstance();
     method public androidx.appsearch.builtintypes.AlarmInstance? getPreviousInstance();
     method public String? getRingtone();
-    method public int getScore();
-    method public long getTtlMillis();
     method public boolean isEnabled();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
   }
 
   public static final class Alarm.Builder {
     ctor public Alarm.Builder(String, String);
     ctor public Alarm.Builder(androidx.appsearch.builtintypes.Alarm);
     method public androidx.appsearch.builtintypes.Alarm build();
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutEndTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutStartTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodEndDate(String?);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodStartDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setDaysOfWeek(@IntRange(from=java.util.Calendar.SUNDAY, to=java.util.Calendar.SATURDAY) int...);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setEnabled(boolean);
     method public androidx.appsearch.builtintypes.Alarm.Builder setHour(@IntRange(from=0, to=23) int);
     method public androidx.appsearch.builtintypes.Alarm.Builder setMinute(@IntRange(from=0, to=59) int);
@@ -46,24 +48,18 @@
     method public androidx.appsearch.builtintypes.Alarm.Builder setNextInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setPreviousInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setShouldVibrate(boolean);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public class AlarmInstance {
+  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public final class AlarmInstance {
     method public long getCreationTimestampMillis();
-    method @IntRange(from=1, to=31) public int getDay();
-    method @IntRange(from=0, to=23) public int getHour();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public String getId();
-    method @IntRange(from=0, to=59) public int getMinute();
-    method @IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) public int getMonth();
     method public String getNamespace();
-    method public int getScore();
+    method public String getScheduledTime();
     method public long getSnoozeDurationMillis();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public int getYear();
     field public static final int STATUS_DISMISSED = 3; // 0x3
     field public static final int STATUS_FIRING = 2; // 0x2
     field public static final int STATUS_MISSED = 5; // 0x5
@@ -73,35 +69,34 @@
   }
 
   public static final class AlarmInstance.Builder {
-    ctor public AlarmInstance.Builder(String, String);
+    ctor public AlarmInstance.Builder(String, String, String);
     ctor public AlarmInstance.Builder(androidx.appsearch.builtintypes.AlarmInstance);
     method public androidx.appsearch.builtintypes.AlarmInstance build();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setCreationTimestampMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDay(@IntRange(from=1, to=31) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setHour(@IntRange(from=0, to=23) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMinute(@IntRange(from=0, to=59) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMonth(@IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setSnoozeDurationMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setYear(int);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:Timer") public class Timer {
+  @androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
+    method public int getBootCount();
     method public long getCreationTimestampMillis();
+    method public long getCurrentRemainingTime(android.content.Context);
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public long getDurationMillis();
+    method public long getExpirationTimeMillis(android.content.Context);
     method public String getId();
     method public String? getName();
     method public String getNamespace();
-    method public long getRemainingTimeMillis();
+    method public long getOriginalDurationMillis();
+    method public long getRemainingTimeMillisSinceUpdate();
     method public String? getRingtone();
-    method public int getScore();
     method public long getStartTimeMillis();
     method public long getStartTimeMillisInElapsedRealtime();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
     field public static final int STATUS_EXPIRED = 3; // 0x3
     field public static final int STATUS_MISSED = 4; // 0x4
     field public static final int STATUS_PAUSED = 2; // 0x2
@@ -115,16 +110,17 @@
     ctor public Timer.Builder(androidx.appsearch.builtintypes.Timer);
     method public androidx.appsearch.builtintypes.Timer build();
     method public androidx.appsearch.builtintypes.Timer.Builder setCreationTimestampMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillisSinceUpdate(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillisInElapsedRealtime(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long, long, int);
+    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Timer.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setVibrate(boolean);
   }
 
 }

diff --git a/appsearch/appsearch-builtin-types/api/restricted_current.txt b/appsearch/appsearch-builtin-types/api/restricted_current.txt
index b69955c..0b067df 100644
--- a/appsearch/appsearch-builtin-types/api/restricted_current.txt
+++ b/appsearch/appsearch-builtin-types/api/restricted_current.txt

@@ -14,11 +14,13 @@
 
 package androidx.appsearch.builtintypes {
 
-  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public class Alarm {
-    method public long getBlackoutEndTimeMillis();
-    method public long getBlackoutStartTimeMillis();
+  @androidx.appsearch.annotation.Document(name="builtin:Alarm") public final class Alarm {
+    method public String? getBlackoutPeriodEndDate();
+    method public String? getBlackoutPeriodStartDate();
     method public long getCreationTimestampMillis();
     method public int[]? getDaysOfWeek();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method @IntRange(from=0, to=23) public int getHour();
     method public String getId();
     method @IntRange(from=0, to=59) public int getMinute();
@@ -27,20 +29,20 @@
     method public androidx.appsearch.builtintypes.AlarmInstance? getNextInstance();
     method public androidx.appsearch.builtintypes.AlarmInstance? getPreviousInstance();
     method public String? getRingtone();
-    method public int getScore();
-    method public long getTtlMillis();
     method public boolean isEnabled();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
   }
 
   public static final class Alarm.Builder {
     ctor public Alarm.Builder(String, String);
     ctor public Alarm.Builder(androidx.appsearch.builtintypes.Alarm);
     method public androidx.appsearch.builtintypes.Alarm build();
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutEndTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutStartTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodEndDate(String?);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setBlackoutPeriodStartDate(String?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setCreationTimestampMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setDaysOfWeek(@IntRange(from=java.util.Calendar.SUNDAY, to=java.util.Calendar.SATURDAY) int...);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Alarm.Builder setEnabled(boolean);
     method public androidx.appsearch.builtintypes.Alarm.Builder setHour(@IntRange(from=0, to=23) int);
     method public androidx.appsearch.builtintypes.Alarm.Builder setMinute(@IntRange(from=0, to=59) int);
@@ -48,24 +50,18 @@
     method public androidx.appsearch.builtintypes.Alarm.Builder setNextInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setPreviousInstance(androidx.appsearch.builtintypes.AlarmInstance?);
     method public androidx.appsearch.builtintypes.Alarm.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Alarm.Builder setVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Alarm.Builder setShouldVibrate(boolean);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public class AlarmInstance {
+  @androidx.appsearch.annotation.Document(name="builtin:AlarmInstance") public final class AlarmInstance {
     method public long getCreationTimestampMillis();
-    method @IntRange(from=1, to=31) public int getDay();
-    method @IntRange(from=0, to=23) public int getHour();
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public String getId();
-    method @IntRange(from=0, to=59) public int getMinute();
-    method @IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) public int getMonth();
     method public String getNamespace();
-    method public int getScore();
+    method public String getScheduledTime();
     method public long getSnoozeDurationMillis();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public int getYear();
     field public static final int STATUS_DISMISSED = 3; // 0x3
     field public static final int STATUS_FIRING = 2; // 0x2
     field public static final int STATUS_MISSED = 5; // 0x5
@@ -75,35 +71,34 @@
   }
 
   public static final class AlarmInstance.Builder {
-    ctor public AlarmInstance.Builder(String, String);
+    ctor public AlarmInstance.Builder(String, String, String);
     ctor public AlarmInstance.Builder(androidx.appsearch.builtintypes.AlarmInstance);
     method public androidx.appsearch.builtintypes.AlarmInstance build();
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setCreationTimestampMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDay(@IntRange(from=1, to=31) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setHour(@IntRange(from=0, to=23) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMinute(@IntRange(from=0, to=59) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setMonth(@IntRange(from=java.util.Calendar.JANUARY, to=java.util.Calendar.DECEMBER) int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setSnoozeDurationMillis(long);
     method public androidx.appsearch.builtintypes.AlarmInstance.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.AlarmInstance.Builder setYear(int);
   }
 
-  @androidx.appsearch.annotation.Document(name="builtin:Timer") public class Timer {
+  @androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
+    method public int getBootCount();
     method public long getCreationTimestampMillis();
+    method public long getCurrentRemainingTime(android.content.Context);
+    method public int getDocumentScore();
+    method public long getDocumentTtlMillis();
     method public long getDurationMillis();
+    method public long getExpirationTimeMillis(android.content.Context);
     method public String getId();
     method public String? getName();
     method public String getNamespace();
-    method public long getRemainingTimeMillis();
+    method public long getOriginalDurationMillis();
+    method public long getRemainingTimeMillisSinceUpdate();
     method public String? getRingtone();
-    method public int getScore();
     method public long getStartTimeMillis();
     method public long getStartTimeMillisInElapsedRealtime();
     method public int getStatus();
-    method public long getTtlMillis();
-    method public boolean isVibrate();
+    method public boolean shouldVibrate();
     field public static final int STATUS_EXPIRED = 3; // 0x3
     field public static final int STATUS_MISSED = 4; // 0x4
     field public static final int STATUS_PAUSED = 2; // 0x2
@@ -117,16 +112,17 @@
     ctor public Timer.Builder(androidx.appsearch.builtintypes.Timer);
     method public androidx.appsearch.builtintypes.Timer build();
     method public androidx.appsearch.builtintypes.Timer.Builder setCreationTimestampMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentScore(int);
+    method public androidx.appsearch.builtintypes.Timer.Builder setDocumentTtlMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillisSinceUpdate(long);
     method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
-    method public androidx.appsearch.builtintypes.Timer.Builder setScore(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillisInElapsedRealtime(long);
+    method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
+    method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long, long, int);
+    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(android.content.Context, long, long);
     method public androidx.appsearch.builtintypes.Timer.Builder setStatus(int);
-    method public androidx.appsearch.builtintypes.Timer.Builder setTtlMillis(long);
-    method public androidx.appsearch.builtintypes.Timer.Builder setVibrate(boolean);
   }
 
 }

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java
index 5c8188f..f1b0573 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java

@@ -106,16 +106,15 @@
 
     private static Timer timer(@NonNull final String id, @NonNull final String name) {
         return new Timer.Builder(ShortcutAdapter.DEFAULT_NAMESPACE, id)
-                .setScore(1)
-                .setTtlMillis(6000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(6000)
                 .setCreationTimestampMillis(100)
                 .setName(name)
                 .setDurationMillis(1000)
-                .setRemainingTimeMillis(500)
+                .setRemainingTimeMillisSinceUpdate(500)
                 .setRingtone("clock://ringtone/1")
                 .setStatus(Timer.STATUS_STARTED)
-                .setVibrate(true)
-                .setStartTimeMillis(750)
+                .setShouldVibrate(true)
                 .build();
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmInstanceTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmInstanceTest.java
index b37aae7e..f2e7df4 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmInstanceTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmInstanceTest.java

@@ -22,49 +22,35 @@
 
 import org.junit.Test;
 
-import java.util.Calendar;
-
 public class AlarmInstanceTest {
     @Test
     public void testBuilder() {
-        AlarmInstance alarmInstance = new AlarmInstance.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+        AlarmInstance alarmInstance = new AlarmInstance.Builder(
+                "namespace", "id", "2022-12-01T07:30:00")
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
-                .setYear(2022)
-                .setMonth(Calendar.DECEMBER)
-                .setDay(1)
-                .setHour(7)
-                .setMinute(30)
                 .setStatus(AlarmInstance.STATUS_SCHEDULED)
                 .setSnoozeDurationMillis(10000)
                 .build();
 
         assertThat(alarmInstance.getNamespace()).isEqualTo("namespace");
         assertThat(alarmInstance.getId()).isEqualTo("id");
-        assertThat(alarmInstance.getScore()).isEqualTo(1);
-        assertThat(alarmInstance.getTtlMillis()).isEqualTo(20000);
+        assertThat(alarmInstance.getDocumentScore()).isEqualTo(1);
+        assertThat(alarmInstance.getDocumentTtlMillis()).isEqualTo(20000);
         assertThat(alarmInstance.getCreationTimestampMillis()).isEqualTo(100);
-        assertThat(alarmInstance.getYear()).isEqualTo(2022);
-        assertThat(alarmInstance.getMonth()).isEqualTo(Calendar.DECEMBER);
-        assertThat(alarmInstance.getDay()).isEqualTo(1);
-        assertThat(alarmInstance.getHour()).isEqualTo(7);
-        assertThat(alarmInstance.getMinute()).isEqualTo(30);
+        assertThat(alarmInstance.getScheduledTime()).isEqualTo("2022-12-01T07:30:00");
         assertThat(alarmInstance.getStatus()).isEqualTo(1);
         assertThat(alarmInstance.getSnoozeDurationMillis()).isEqualTo(10000);
     }
 
     @Test
     public void testBuilderCopy_returnsAlarmInstanceWithAllFieldsCopied() {
-        AlarmInstance alarmInstance1 = new AlarmInstance.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+        AlarmInstance alarmInstance1 = new AlarmInstance.Builder(
+                "namespace", "id", "2022-12-01T07:30:00")
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
-                .setYear(2022)
-                .setMonth(Calendar.DECEMBER)
-                .setDay(1)
-                .setHour(7)
-                .setMinute(30)
                 .setStatus(AlarmInstance.STATUS_SCHEDULED)
                 .setSnoozeDurationMillis(10000)
                 .build();
@@ -72,15 +58,12 @@
         AlarmInstance alarmInstance2 = new AlarmInstance.Builder(alarmInstance1).build();
         assertThat(alarmInstance1.getNamespace()).isEqualTo(alarmInstance2.getNamespace());
         assertThat(alarmInstance1.getId()).isEqualTo(alarmInstance2.getId());
-        assertThat(alarmInstance1.getScore()).isEqualTo(alarmInstance2.getScore());
-        assertThat(alarmInstance1.getTtlMillis()).isEqualTo(alarmInstance2.getTtlMillis());
+        assertThat(alarmInstance1.getDocumentScore()).isEqualTo(alarmInstance2.getDocumentScore());
+        assertThat(alarmInstance1.getDocumentTtlMillis())
+                .isEqualTo(alarmInstance2.getDocumentTtlMillis());
         assertThat(alarmInstance1.getCreationTimestampMillis())
                 .isEqualTo(alarmInstance2.getCreationTimestampMillis());
-        assertThat(alarmInstance1.getYear()).isEqualTo(alarmInstance2.getYear());
-        assertThat(alarmInstance1.getMonth()).isEqualTo(alarmInstance2.getMonth());
-        assertThat(alarmInstance1.getDay()).isEqualTo(alarmInstance2.getDay());
-        assertThat(alarmInstance1.getHour()).isEqualTo(alarmInstance2.getHour());
-        assertThat(alarmInstance1.getMinute()).isEqualTo(alarmInstance2.getMinute());
+        assertThat(alarmInstance1.getScheduledTime()).isEqualTo(alarmInstance2.getScheduledTime());
         assertThat(alarmInstance1.getStatus()).isEqualTo(alarmInstance2.getStatus());
         assertThat(alarmInstance1.getSnoozeDurationMillis())
                 .isEqualTo(alarmInstance2.getSnoozeDurationMillis());
@@ -88,15 +71,11 @@
 
     @Test
     public void testToGenericDocument() throws Exception {
-        AlarmInstance alarmInstance = new AlarmInstance.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+        AlarmInstance alarmInstance = new AlarmInstance.Builder(
+                "namespace", "id", "2022-12-01T07:30:00")
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
-                .setYear(2022)
-                .setMonth(Calendar.DECEMBER)
-                .setDay(1)
-                .setHour(7)
-                .setMinute(30)
                 .setStatus(AlarmInstance.STATUS_SCHEDULED)
                 .setSnoozeDurationMillis(10000)
                 .build();
@@ -108,12 +87,7 @@
         assertThat(genericDocument.getScore()).isEqualTo(1);
         assertThat(genericDocument.getTtlMillis()).isEqualTo(20000);
         assertThat(genericDocument.getCreationTimestampMillis()).isEqualTo(100);
-        assertThat(genericDocument.getPropertyLong("year")).isEqualTo(2022);
-        assertThat(genericDocument.getPropertyLong("month")).isEqualTo(Calendar.DECEMBER);
-        assertThat(genericDocument.getPropertyLong("day")).isEqualTo(1);
-        assertThat(genericDocument.getPropertyLong("hour")).isEqualTo(7);
-        assertThat(genericDocument.getPropertyLong("minute")).isEqualTo(30);
-        assertThat(genericDocument.getPropertyLong("status")).isEqualTo(1);
-        assertThat(genericDocument.getPropertyLong("snoozeDurationMillis")).isEqualTo(10000);
+        assertThat(genericDocument.getPropertyString("scheduledTime"))
+                .isEqualTo("2022-12-01T07:30:00");
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmTest.java
index b953f60..201083a 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/AlarmTest.java

@@ -29,13 +29,15 @@
 public class AlarmTest {
     @Test
     public void testBuilder() {
-        AlarmInstance alarmInstance1 = new AlarmInstance.Builder("namespace", "instanceId1")
+        AlarmInstance alarmInstance1 = new AlarmInstance.Builder(
+                "namespace", "instanceId1", "2022-01-01T00:00:00")
                 .build();
-        AlarmInstance alarmInstance2 = new AlarmInstance.Builder("namespace", "instanceId2")
+        AlarmInstance alarmInstance2 = new AlarmInstance.Builder(
+                "namespace", "instanceId2", "2022-01-02T00:00:00")
                 .build();
         Alarm alarm = new Alarm.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
                 .setName("my alarm")
                 .setEnabled(true)
@@ -43,18 +45,18 @@
                         Calendar.THURSDAY, Calendar.FRIDAY)
                 .setHour(12)
                 .setMinute(0)
-                .setBlackoutStartTimeMillis(1000)
-                .setBlackoutEndTimeMillis(2000)
+                .setBlackoutPeriodStartDate("2022-01-14")
+                .setBlackoutPeriodEndDate("2022-02-14")
                 .setRingtone("clock://ringtone/1")
-                .setVibrate(true)
+                .setShouldVibrate(true)
                 .setPreviousInstance(alarmInstance1)
                 .setNextInstance(alarmInstance2)
                 .build();
 
         assertThat(alarm.getNamespace()).isEqualTo("namespace");
         assertThat(alarm.getId()).isEqualTo("id");
-        assertThat(alarm.getScore()).isEqualTo(1);
-        assertThat(alarm.getTtlMillis()).isEqualTo(20000);
+        assertThat(alarm.getDocumentScore()).isEqualTo(1);
+        assertThat(alarm.getDocumentTtlMillis()).isEqualTo(20000);
         assertThat(alarm.getCreationTimestampMillis()).isEqualTo(100);
         assertThat(alarm.getName()).isEqualTo("my alarm");
         assertThat(alarm.isEnabled()).isTrue();
@@ -62,23 +64,25 @@
                 Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY);
         assertThat(alarm.getHour()).isEqualTo(12);
         assertThat(alarm.getMinute()).isEqualTo(0);
-        assertThat(alarm.getBlackoutStartTimeMillis()).isEqualTo(1000);
-        assertThat(alarm.getBlackoutEndTimeMillis()).isEqualTo(2000);
+        assertThat(alarm.getBlackoutPeriodStartDate()).isEqualTo("2022-01-14");
+        assertThat(alarm.getBlackoutPeriodEndDate()).isEqualTo("2022-02-14");
         assertThat(alarm.getRingtone()).isEqualTo("clock://ringtone/1");
-        assertThat(alarm.isVibrate()).isTrue();
+        assertThat(alarm.shouldVibrate()).isTrue();
         assertThat(alarm.getPreviousInstance()).isEqualTo(alarmInstance1);
         assertThat(alarm.getNextInstance()).isEqualTo(alarmInstance2);
     }
 
     @Test
     public void testBuilderCopy_returnsAlarmWithAllFieldsCopied() {
-        AlarmInstance alarmInstance1 = new AlarmInstance.Builder("namespace", "instanceId1")
+        AlarmInstance alarmInstance1 = new AlarmInstance.Builder(
+                "namespace", "instanceId1", "2022-01-01T00:00:00")
                 .build();
-        AlarmInstance alarmInstance2 = new AlarmInstance.Builder("namespace", "instanceId2")
+        AlarmInstance alarmInstance2 = new AlarmInstance.Builder(
+                "namespace", "instanceId2", "2022-01-02T00:00:00")
                 .build();
         Alarm alarm1 = new Alarm.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
                 .setName("my alarm")
                 .setEnabled(true)
@@ -86,10 +90,10 @@
                         Calendar.THURSDAY, Calendar.FRIDAY)
                 .setHour(12)
                 .setMinute(0)
-                .setBlackoutStartTimeMillis(1000)
-                .setBlackoutEndTimeMillis(2000)
+                .setBlackoutPeriodStartDate("2022-01-14")
+                .setBlackoutPeriodEndDate("2022-02-14")
                 .setRingtone("clock://ringtone/1")
-                .setVibrate(true)
+                .setShouldVibrate(true)
                 .setPreviousInstance(alarmInstance1)
                 .setNextInstance(alarmInstance2)
                 .build();
@@ -97,8 +101,8 @@
         Alarm alarm2 = new Alarm.Builder(alarm1).build();
         assertThat(alarm1.getNamespace()).isEqualTo(alarm2.getNamespace());
         assertThat(alarm1.getId()).isEqualTo(alarm2.getId());
-        assertThat(alarm1.getScore()).isEqualTo(alarm2.getScore());
-        assertThat(alarm1.getTtlMillis()).isEqualTo(alarm2.getTtlMillis());
+        assertThat(alarm1.getDocumentScore()).isEqualTo(alarm2.getDocumentScore());
+        assertThat(alarm1.getDocumentTtlMillis()).isEqualTo(alarm2.getDocumentTtlMillis());
         assertThat(alarm1.getCreationTimestampMillis())
                 .isEqualTo(alarm2.getCreationTimestampMillis());
         assertThat(alarm1.getName()).isEqualTo(alarm2.getName());
@@ -106,26 +110,29 @@
         assertThat(alarm1.getDaysOfWeek()).isEqualTo(alarm2.getDaysOfWeek());
         assertThat(alarm1.getHour()).isEqualTo(alarm2.getHour());
         assertThat(alarm1.getMinute()).isEqualTo(alarm2.getMinute());
-        assertThat(alarm1.getBlackoutStartTimeMillis())
-                .isEqualTo(alarm2.getBlackoutStartTimeMillis());
-        assertThat(alarm1.getBlackoutEndTimeMillis()).isEqualTo(alarm2.getBlackoutEndTimeMillis());
+        assertThat(alarm1.getBlackoutPeriodStartDate())
+                .isEqualTo(alarm2.getBlackoutPeriodStartDate());
+        assertThat(alarm1.getBlackoutPeriodEndDate())
+                .isEqualTo(alarm2.getBlackoutPeriodEndDate());
         assertThat(alarm1.getRingtone()).isEqualTo(alarm2.getRingtone());
-        assertThat(alarm1.isVibrate()).isEqualTo(alarm2.isVibrate());
+        assertThat(alarm1.shouldVibrate()).isEqualTo(alarm2.shouldVibrate());
         assertThat(alarm1.getPreviousInstance()).isEqualTo(alarm2.getPreviousInstance());
         assertThat(alarm1.getNextInstance()).isEqualTo(alarm2.getNextInstance());
     }
 
     @Test
     public void testToGenericDocument() throws Exception {
-        AlarmInstance alarmInstance1 = new AlarmInstance.Builder("namespace", "instanceId1")
+        AlarmInstance alarmInstance1 = new AlarmInstance.Builder(
+                "namespace", "instanceId1", "2022-01-01T00:00:00")
                 .setCreationTimestampMillis(100)
                 .build();
-        AlarmInstance alarmInstance2 = new AlarmInstance.Builder("namespace", "instanceId2")
+        AlarmInstance alarmInstance2 = new AlarmInstance.Builder(
+                "namespace", "instanceId2", "2022-01-02T00:00:00")
                 .setCreationTimestampMillis(100)
                 .build();
         Alarm alarm = new Alarm.Builder("namespace", "id")
-                .setScore(1)
-                .setTtlMillis(20000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(20000)
                 .setCreationTimestampMillis(100)
                 .setName("my alarm")
                 .setEnabled(true)
@@ -133,10 +140,10 @@
                         Calendar.THURSDAY, Calendar.FRIDAY)
                 .setHour(12)
                 .setMinute(0)
-                .setBlackoutStartTimeMillis(1000)
-                .setBlackoutEndTimeMillis(2000)
+                .setBlackoutPeriodStartDate("2022-01-14")
+                .setBlackoutPeriodEndDate("2022-02-14")
                 .setRingtone("clock://ringtone/1")
-                .setVibrate(true)
+                .setShouldVibrate(true)
                 .setPreviousInstance(alarmInstance1)
                 .setNextInstance(alarmInstance2)
                 .build();
@@ -146,18 +153,20 @@
         assertThat(genericDocument.getNamespace()).isEqualTo("namespace");
         assertThat(genericDocument.getId()).isEqualTo("id");
         assertThat(genericDocument.getScore()).isEqualTo(1);
-        assertThat(genericDocument.getTtlMillis()).isEqualTo(20000);
         assertThat(genericDocument.getCreationTimestampMillis()).isEqualTo(100);
+        assertThat(genericDocument.getTtlMillis()).isEqualTo(20000);
         assertThat(genericDocument.getPropertyString("name")).isEqualTo("my alarm");
         assertThat(genericDocument.getPropertyBoolean("enabled")).isTrue();
         assertThat(genericDocument.getPropertyLongArray("daysOfWeek")).asList()
                 .containsExactly(2L, 3L, 4L, 5L, 6L);
         assertThat(genericDocument.getPropertyLong("hour")).isEqualTo(12);
         assertThat(genericDocument.getPropertyLong("minute")).isEqualTo(0);
-        assertThat(genericDocument.getPropertyLong("blackoutStartTimeMillis")).isEqualTo(1000);
-        assertThat(genericDocument.getPropertyLong("blackoutEndTimeMillis")).isEqualTo(2000);
+        assertThat(genericDocument.getPropertyString("blackoutPeriodStartDate"))
+                .isEqualTo("2022-01-14");
+        assertThat(genericDocument.getPropertyString("blackoutPeriodEndDate"))
+                .isEqualTo("2022-02-14");
         assertThat(genericDocument.getPropertyString("ringtone")).isEqualTo("clock://ringtone/1");
-        assertThat(genericDocument.getPropertyBoolean("vibrate")).isTrue();
+        assertThat(genericDocument.getPropertyBoolean("shouldVibrate")).isTrue();
         assertThat(genericDocument.getPropertyDocument("previousInstance"))
                 .isEqualTo(GenericDocument.fromDocumentClass(alarmInstance1));
         assertThat(genericDocument.getPropertyDocument("nextInstance"))

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java
index ca78c58..e6f0acb 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java

@@ -26,99 +26,118 @@
     @Test
     public void testBuilder() {
         Timer timer = new Timer.Builder("namespace", "id1")
-                .setScore(1)
-                .setTtlMillis(6000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(6000)
                 .setCreationTimestampMillis(100)
                 .setName("my timer")
                 .setDurationMillis(1000)
-                .setRemainingTimeMillis(500)
+                .setOriginalDurationMillis(800)
+                .setRemainingTimeMillisSinceUpdate(500)
                 .setRingtone("clock://ringtone/1")
                 .setStatus(Timer.STATUS_STARTED)
-                .setVibrate(true)
-                .setStartTimeMillis(750)
-                .setStartTimeMillisInElapsedRealtime(700L)
+                .setShouldVibrate(true)
+                .setStartTimeMillis(
+                        /*startTimeMillis=*/750,
+                        /*startTimeMillisInElapsedRealtime=*/700,
+                        /*bootCount=*/1)
                 .build();
 
         assertThat(timer.getNamespace()).isEqualTo("namespace");
         assertThat(timer.getId()).isEqualTo("id1");
-        assertThat(timer.getTtlMillis()).isEqualTo(6000);
-        assertThat(timer.getScore()).isEqualTo(1);
+        assertThat(timer.getDocumentScore()).isEqualTo(1);
+        assertThat(timer.getDocumentTtlMillis()).isEqualTo(6000);
         assertThat(timer.getCreationTimestampMillis()).isEqualTo(100);
         assertThat(timer.getName()).isEqualTo("my timer");
         assertThat(timer.getDurationMillis()).isEqualTo(1000);
-        assertThat(timer.getRemainingTimeMillis()).isEqualTo(500);
+        assertThat(timer.getOriginalDurationMillis()).isEqualTo(800);
+        assertThat(timer.getRemainingTimeMillisSinceUpdate()).isEqualTo(500);
         assertThat(timer.getRingtone()).isEqualTo("clock://ringtone/1");
-        assertThat(timer.getStatus()).isEqualTo(1);
-        assertThat(timer.isVibrate()).isEqualTo(true);
+        assertThat(timer.getStatus()).isEqualTo(Timer.STATUS_STARTED);
+        assertThat(timer.shouldVibrate()).isEqualTo(true);
         assertThat(timer.getStartTimeMillis()).isEqualTo(750);
         assertThat(timer.getStartTimeMillisInElapsedRealtime()).isEqualTo(700);
+        assertThat(timer.getBootCount()).isEqualTo(1);
     }
 
     @Test
     public void testBuilderCopy_allFieldsCopied() {
         Timer timer1 = new Timer.Builder("namespace", "id1")
-                .setScore(1)
-                .setTtlMillis(6000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(6000)
                 .setCreationTimestampMillis(100)
                 .setName("my timer")
                 .setDurationMillis(1000)
-                .setRemainingTimeMillis(500)
+                .setOriginalDurationMillis(800)
+                .setRemainingTimeMillisSinceUpdate(500)
                 .setRingtone("clock://ringtone/1")
                 .setStatus(Timer.STATUS_STARTED)
-                .setVibrate(true)
-                .setStartTimeMillis(750)
-                .setStartTimeMillisInElapsedRealtime(700L)
+                .setShouldVibrate(true)
+                .setStartTimeMillis(
+                        /*startTimeMillis=*/750,
+                        /*startTimeMillisInElapsedRealtime=*/700,
+                        /*bootCount=*/1)
                 .build();
         Timer timer2 = new Timer.Builder(timer1).build();
 
         assertThat(timer1.getNamespace()).isEqualTo(timer2.getNamespace());
         assertThat(timer1.getId()).isEqualTo(timer2.getId());
-        assertThat(timer1.getTtlMillis()).isEqualTo(timer2.getTtlMillis());
-        assertThat(timer1.getScore()).isEqualTo(timer2.getScore());
+        assertThat(timer1.getDocumentScore()).isEqualTo(timer2.getDocumentScore());
+        assertThat(timer1.getDocumentTtlMillis()).isEqualTo(timer2.getDocumentTtlMillis());
         assertThat(timer1.getCreationTimestampMillis())
                 .isEqualTo(timer2.getCreationTimestampMillis());
         assertThat(timer1.getName()).isEqualTo(timer2.getName());
         assertThat(timer1.getDurationMillis()).isEqualTo(timer2.getDurationMillis());
-        assertThat(timer1.getRemainingTimeMillis()).isEqualTo(timer2.getRemainingTimeMillis());
+        assertThat(timer1.getOriginalDurationMillis())
+                .isEqualTo(timer2.getOriginalDurationMillis());
+        assertThat(timer1.getRemainingTimeMillisSinceUpdate())
+                .isEqualTo(timer2.getRemainingTimeMillisSinceUpdate());
         assertThat(timer1.getRingtone()).isEqualTo(timer2.getRingtone());
         assertThat(timer1.getStatus()).isEqualTo(timer2.getStatus());
-        assertThat(timer1.isVibrate()).isEqualTo(timer2.isVibrate());
+        assertThat(timer1.shouldVibrate()).isEqualTo(timer2.shouldVibrate());
         assertThat(timer1.getStartTimeMillis()).isEqualTo(timer2.getStartTimeMillis());
         assertThat(timer1.getStartTimeMillisInElapsedRealtime())
                 .isEqualTo(timer2.getStartTimeMillisInElapsedRealtime());
+        assertThat(timer1.getBootCount()).isEqualTo(timer2.getBootCount());
     }
 
     @Test
     public void testToGenericDocument() throws Exception {
         Timer timer = new Timer.Builder("namespace", "id1")
-                .setScore(1)
-                .setTtlMillis(6000)
+                .setDocumentScore(1)
+                .setDocumentTtlMillis(6000)
                 .setCreationTimestampMillis(100)
                 .setName("my timer")
                 .setDurationMillis(1000)
-                .setRemainingTimeMillis(500)
+                .setOriginalDurationMillis(800)
+                .setRemainingTimeMillisSinceUpdate(500)
                 .setRingtone("clock://ringtone/1")
                 .setStatus(Timer.STATUS_STARTED)
-                .setVibrate(true)
-                .setStartTimeMillis(750)
-                .setStartTimeMillisInElapsedRealtime(700L)
+                .setShouldVibrate(true)
+                .setStartTimeMillis(
+                        /*startTimeMillis=*/750,
+                        /*startTimeMillisInElapsedRealtime=*/700,
+                        /*bootCount=*/1)
                 .build();
 
         GenericDocument genericDocument = GenericDocument.fromDocumentClass(timer);
         assertThat(genericDocument.getSchemaType()).isEqualTo("builtin:Timer");
         assertThat(genericDocument.getNamespace()).isEqualTo("namespace");
         assertThat(genericDocument.getId()).isEqualTo("id1");
-        assertThat(genericDocument.getTtlMillis()).isEqualTo(6000);
         assertThat(genericDocument.getScore()).isEqualTo(1);
+        assertThat(genericDocument.getTtlMillis()).isEqualTo(6000);
         assertThat(genericDocument.getCreationTimestampMillis()).isEqualTo(100);
         assertThat(genericDocument.getPropertyString("name")).isEqualTo("my timer");
         assertThat(genericDocument.getPropertyLong("durationMillis")).isEqualTo(1000);
-        assertThat(genericDocument.getPropertyLong("remainingTimeMillis")).isEqualTo(500);
+        assertThat(genericDocument.getPropertyLong("originalDurationMillis"))
+                .isEqualTo(800);
+        assertThat(genericDocument.getPropertyLong("remainingTimeMillisSinceUpdate"))
+                .isEqualTo(500);
         assertThat(genericDocument.getPropertyString("ringtone")).isEqualTo("clock://ringtone/1");
         assertThat(genericDocument.getPropertyLong("status")).isEqualTo(1);
-        assertThat(genericDocument.getPropertyBoolean("vibrate")).isTrue();
+        assertThat(genericDocument.getPropertyBoolean("shouldVibrate")).isTrue();
         assertThat(genericDocument.getPropertyLong("startTimeMillis")).isEqualTo(750);
         assertThat(genericDocument.getPropertyLong("startTimeMillisInElapsedRealtime"))
                 .isEqualTo(700);
+        assertThat(genericDocument.getPropertyLong("bootCount")).isEqualTo(1);
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java
new file mode 100644
index 0000000..cf76375
--- /dev/null
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 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.utils;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
+public class DateTimeFormatValidatorTest {
+    @Test
+    public void testValidateISO8601Date_validDate_returnsTrue() {
+        assertThat(DateTimeFormatValidator.validateISO8601Date("2022-01-01")).isTrue();
+    }
+
+    @Test
+    public void testValidateISO8601Date_invalidDate_returnsFalse() {
+        assertThat(DateTimeFormatValidator.validateISO8601Date("2022:01:01")).isFalse();
+    }
+
+    @Test
+    public void testValidateISO8601Date_notExactMatch_returnsFalse() {
+        assertThat(DateTimeFormatValidator.validateISO8601Date("2022-01-01T00:00:00"))
+                .isFalse();
+    }
+
+    @Test
+    public void testValidateISO8601DateTime_validDate_returnsTrue() {
+        assertThat(DateTimeFormatValidator.validateISO8601DateTime("2022-01-01T00:00:00"))
+                .isTrue();
+    }
+
+    @Test
+    public void testValidateISO8601DateTime_invalidDate_returnsFalse() {
+        assertThat(DateTimeFormatValidator.validateISO8601DateTime("2022:01:01T00-00-00"))
+                .isFalse();
+    }
+
+    @Test
+    public void testValidateISO8601DateTime_notExactMatch_returnsFalse() {
+        assertThat(DateTimeFormatValidator.validateISO8601DateTime("2022-01-01T00:00:00.000"))
+                .isFalse();
+    }
+}

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java
index 69d384b..7ebe9b2 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Alarm.java

@@ -21,15 +21,16 @@
 import androidx.annotation.Nullable;
 import androidx.appsearch.annotation.Document;
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
+import androidx.appsearch.utils.DateTimeFormatValidator;
 import androidx.core.util.Preconditions;
 
 import java.util.Calendar;
 
 /**
- * AppSearch document representing an Alarm entity.
+ * AppSearch document representing an {@link Alarm} entity.
  */
 @Document(name = "builtin:Alarm")
-public class Alarm {
+public final class Alarm {
     @Document.Namespace
     private final String mNamespace;
 
@@ -37,13 +38,13 @@
     private final String mId;
 
     @Document.Score
-    private final int mScore;
+    private final int mDocumentScore;
 
     @Document.CreationTimestampMillis
     private final long mCreationTimestampMillis;
 
     @Document.TtlMillis
-    private final long mTtlMillis;
+    private final long mDocumentTtlMillis;
 
     @Document.StringProperty(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
     private final String mName;
@@ -60,17 +61,17 @@
     @Document.LongProperty
     private final int mMinute;
 
-    @Document.LongProperty
-    private final long mBlackoutStartTimeMillis;
+    @Document.StringProperty
+    private final String mBlackoutPeriodStartDate;
 
-    @Document.LongProperty
-    private final long mBlackoutEndTimeMillis;
+    @Document.StringProperty
+    private final String mBlackoutPeriodEndDate;
 
     @Document.StringProperty
     private final String mRingtone;
 
     @Document.BooleanProperty
-    private final boolean mVibrate;
+    private final boolean mShouldVibrate;
 
     @Document.DocumentProperty
     private final AlarmInstance mPreviousInstance;
@@ -78,68 +79,82 @@
     @Document.DocumentProperty
     private final AlarmInstance mNextInstance;
 
-    Alarm(String namespace, String id, int score, long creationTimestampMillis, long ttlMillis,
-            String name, boolean enabled, int[] daysOfWeek, int hour, int minute,
-            long blackoutStartTimeMillis, long blackoutEndTimeMillis, String ringtone,
-            boolean vibrate, AlarmInstance previousInstance, AlarmInstance nextInstance) {
-        mNamespace = namespace;
-        mId = id;
-        mScore = score;
+    Alarm(@NonNull String namespace, @NonNull String id, int documentScore,
+            long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
+            boolean enabled, @Nullable int[] daysOfWeek, int hour, int minute,
+            @Nullable String blackoutPeriodStartDate, @Nullable String blackoutPeriodEndDate,
+            @Nullable String ringtone, boolean shouldVibrate,
+            @Nullable AlarmInstance previousInstance, @Nullable AlarmInstance nextInstance) {
+        mNamespace = Preconditions.checkNotNull(namespace);
+        mId = Preconditions.checkNotNull(id);
+        mDocumentScore = documentScore;
         mCreationTimestampMillis = creationTimestampMillis;
-        mTtlMillis = ttlMillis;
+        mDocumentTtlMillis = documentTtlMillis;
         mName = name;
         mEnabled = enabled;
         mDaysOfWeek = daysOfWeek;
         mHour = hour;
         mMinute = minute;
-        mBlackoutStartTimeMillis = blackoutStartTimeMillis;
-        mBlackoutEndTimeMillis = blackoutEndTimeMillis;
+        mBlackoutPeriodStartDate = blackoutPeriodStartDate;
+        mBlackoutPeriodEndDate = blackoutPeriodEndDate;
         mRingtone = ringtone;
-        mVibrate = vibrate;
+        mShouldVibrate = shouldVibrate;
         mPreviousInstance = previousInstance;
         mNextInstance = nextInstance;
     }
 
-    /** Returns the namespace of the {@link Alarm}. */
+    /** Returns the namespace. */
     @NonNull
     public String getNamespace() {
         return mNamespace;
     }
 
-    /** Returns the unique identifier of the {@link Alarm}. */
+    /** Returns the unique identifier. */
     @NonNull
     public String getId() {
         return mId;
     }
 
     /**
-     * Returns the user-provided opaque document score of the {@link Alarm}, which can be
-     * used for ranking using
+     * Returns the user-provided opaque document score of the current AppSearch document, which can
+     * be used for ranking using
      * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}.
+     *
+     * <p>See {@link Document.Score} for more information on score.
      */
-    public int getScore() {
-        return mScore;
+    public int getDocumentScore() {
+        return mDocumentScore;
     }
 
     /**
-     * Returns the creation timestamp for the {@link Alarm} document, in milliseconds using the
+     * Returns the creation timestamp for the current AppSearch entity, in milliseconds using the
      * {@link System#currentTimeMillis()} time base.
+     *
+     * <p>This timestamp refers to the creation time of the AppSearch entity, not when the
+     * document is written into AppSearch.
+     *
+     * <p>If not set, then the current timestamp will be used.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.CreationTimestampMillis} for more
+     * information on creation timestamp.
      */
     public long getCreationTimestampMillis() {
         return mCreationTimestampMillis;
     }
 
     /**
-     * Returns the time-to-live (TTL) for the {@link Alarm} document in milliseconds using the
-     * {@link System#currentTimeMillis()} time base.
+     * Returns the time-to-live (TTL) for the current AppSearch document as a duration in
+     * milliseconds.
      *
-     * <p>The {@link Alarm} document will be automatically deleted when the TTL expires.
+     * <p>The document will be automatically deleted when the TTL expires.
+     *
+     * <p>See {@link Document.TtlMillis} for more information on TTL.
      */
-    public long getTtlMillis() {
-        return mTtlMillis;
+    public long getDocumentTtlMillis() {
+        return mDocumentTtlMillis;
     }
 
-    /** Returns the name associated with the {@link Alarm}. */
+    /** Returns the name. */
     @Nullable
     public String getName() {
         return mName;
@@ -151,7 +166,7 @@
     }
 
     /**
-     * Returns the scheduled days for repeating the {@link Alarm}.
+     * Returns the scheduled days for repeating.
      *
      * <p>Days of the week can be {@link java.util.Calendar#MONDAY},
      * {@link java.util.Calendar#TUESDAY}, {@link java.util.Calendar#WEDNESDAY},
@@ -186,37 +201,39 @@
     }
 
     /**
-     * Returns the start time for the {@link Alarm} blackout period in milliseconds using the
-     * {@link System#currentTimeMillis()} time base.
+     * Returns the start date of the blackout period in ISO 8601 format.
+     * E.g.: 2022-01-14
      *
      * <p>A blackout period means the {@link Alarm} will not fire during this period.
      *
-     * <p>The value {@code 0} indicates that the blackout period has no start time.
+     * <p>If not set, then it indicates that the blackout period has no start time.
      *
-     * <p>If both blackoutStartTime and blackoutEndTime are {@code 0}, then the blackout period
-     * is not defined for this {@link Alarm}.
+     * <p>If neither blackoutPeriodStartDate and blackoutPeriodEndDate are set, then
+     * the blackout period is not defined.
      */
-    public long getBlackoutStartTimeMillis() {
-        return mBlackoutStartTimeMillis;
+    @Nullable
+    public String getBlackoutPeriodStartDate() {
+        return mBlackoutPeriodStartDate;
     }
 
     /**
-     * Returns the end time for the {@link Alarm} blackout period in milliseconds using the
-     * {@link System#currentTimeMillis()} time base.
+     * Returns the end time for the blackout period in ISO 8601 format.
+     * E.g.: 2022-01-14
      *
      * <p>A blackout period means the {@link Alarm} will not fire during this period.
      *
-     * <p>The value {@code 0} indicates that the blackout period has no end time.
+     * <p>If not set, then it indicates that the blackout period has no end time.
      *
-     * <p>If both blackoutStartTime and blackoutEndTime are {@code 0}, then the blackout period
-     * is not defined for this {@link Alarm}.
+     * <p>If neither blackoutPeriodStartDate and blackoutPeriodEndDate are set, then
+     * the blackout period is not defined.
      */
-    public long getBlackoutEndTimeMillis() {
-        return mBlackoutEndTimeMillis;
+    @Nullable
+    public String getBlackoutPeriodEndDate() {
+        return mBlackoutPeriodEndDate;
     }
 
     /**
-     * Returns the ringtone of the {@link Alarm} as a content URI to be played, or
+     * Returns the ringtone as a content URI to be played, or
      * {@link android.provider.AlarmClock#VALUE_RINGTONE_SILENT} if no ringtone will be played.
      */
     @Nullable
@@ -225,15 +242,15 @@
     }
 
     /** Returns whether or not to activate the device vibrator when the {@link Alarm} fires. */
-    public boolean isVibrate() {
-        return mVibrate;
+    public boolean shouldVibrate() {
+        return mShouldVibrate;
     }
 
     /**
-     * Returns the previous {@link AlarmInstance} associated with the {@link Alarm}.
+     * Returns the previous {@link AlarmInstance}.
      *
-     * <p>The previous {@link AlarmInstance} is most recent past instance that was fired. If the
-     * {@link Alarm} has no past instances, then null will be returned.
+     * <p>The previous {@link AlarmInstance} is most recent past instance that was fired. If
+     * there are no past instances, then null will be returned.
      *
      * <p>See {@link AlarmInstance}.
      */
@@ -243,10 +260,10 @@
     }
 
     /**
-     * Returns the next {@link AlarmInstance} associated with the {@link Alarm}.
+     * Returns the next {@link AlarmInstance}.
      *
      * <p>The next {@link AlarmInstance} is the immediate future instance that is scheduled to fire.
-     * If the {@link Alarm} has no future instances, then null will be returned.
+     * If there are no future instances, then null will be returned.
      *
      * <p>See {@link AlarmInstance}.
      */
@@ -256,107 +273,54 @@
     }
 
     /** Builder for {@link Alarm}. */
-    public static final class Builder {
-        private final String mNamespace;
-        private final String mId;
-        private int mScore;
-        private long mCreationTimestampMillis;
-        private long mTtlMillis;
+    public static final class Builder extends BaseBuiltinTypeBuilder<Builder> {
         private String mName;
         private boolean mEnabled;
         private int[] mDaysOfWeek;
         private int mHour;
         private int mMinute;
-        private long mBlackoutStartTimeMillis;
-        private long mBlackoutEndTimeMillis;
+        private String mBlackoutPeriodStartDate;
+        private String mBlackoutPeriodEndDate;
         private String mRingtone;
-        private boolean mVibrate;
+        private boolean mShouldVibrate;
         private AlarmInstance mPreviousInstance;
         private AlarmInstance mNextInstance;
 
         /**
          * Constructor for {@link Alarm.Builder}.
          *
-         * @param namespace Namespace for the {@link Alarm} Document. See
+         * @param namespace Namespace for the Document. See
          * {@link Document.Namespace}.
-         * @param id Unique identifier for the {@link Alarm} Document. See {@link Document.Id}.
+         * @param id Unique identifier for the Document. See {@link Document.Id}.
          */
         public Builder(@NonNull String namespace, @NonNull String id) {
-            mNamespace = Preconditions.checkNotNull(namespace);
-            mId = Preconditions.checkNotNull(id);
-
-            // Default for unset creationTimestampMillis. AppSearch will internally convert this
-            // to current time when creating the GenericDocument.
-            mCreationTimestampMillis = -1;
+            super(namespace, id);
         }
 
         /**
-         * Constructor for {@link Alarm.Builder} with all the existing values of an {@link Alarm}.
+         * Constructor with all the existing values.
          */
         public Builder(@NonNull Alarm alarm) {
             this(alarm.getNamespace(), alarm.getId());
-            mScore = alarm.getScore();
+            mDocumentScore = alarm.getDocumentScore();
             mCreationTimestampMillis = alarm.getCreationTimestampMillis();
-            mTtlMillis = alarm.getTtlMillis();
+            mDocumentTtlMillis = alarm.getDocumentTtlMillis();
             mName = alarm.getName();
             mEnabled = alarm.isEnabled();
             mDaysOfWeek = alarm.getDaysOfWeek();
             mHour = alarm.getHour();
             mMinute = alarm.getMinute();
-            mBlackoutStartTimeMillis = alarm.getBlackoutStartTimeMillis();
-            mBlackoutEndTimeMillis = alarm.getBlackoutEndTimeMillis();
+            mBlackoutPeriodStartDate = alarm.getBlackoutPeriodStartDate();
+            mBlackoutPeriodEndDate = alarm.getBlackoutPeriodEndDate();
             mRingtone = alarm.getRingtone();
-            mVibrate = alarm.isVibrate();
+            mShouldVibrate = alarm.shouldVibrate();
             mPreviousInstance = alarm.getPreviousInstance();
             mNextInstance = alarm.getNextInstance();
         }
 
-        /**
-         * Sets the opaque document score of the {@link Alarm}, which can be used for
-         * ranking using
-         * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}
-         *
-         * <p>See {@link Document.Score}
-         */
+        /** Sets the name. */
         @NonNull
-        public Alarm.Builder setScore(int score) {
-            mScore = score;
-            return this;
-        }
-
-        /**
-         * Sets the Creation Timestamp of the {@link Alarm} document, in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
-         *
-         * <p>If not set, then the current timestamp will be used.
-         *
-         * <p>See {@link Document.CreationTimestampMillis}
-         */
-        @NonNull
-        public Alarm.Builder setCreationTimestampMillis(long creationTimestampMillis) {
-            mCreationTimestampMillis = creationTimestampMillis;
-            return this;
-        }
-
-        /**
-         * Sets the time-to-live (TTL) for the {@link Alarm} document in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
-         *
-         * <p>The {@link Alarm} document will be automatically deleted when the TTL expires.
-         *
-         * <p>If set to 0, then the document will never expire.
-         *
-         * <p>See {@link Document.TtlMillis}
-         */
-        @NonNull
-        public Alarm.Builder setTtlMillis(long ttlMillis) {
-            mTtlMillis = ttlMillis;
-            return this;
-        }
-
-        /** Sets the name of the {@link Alarm}. */
-        @NonNull
-        public Alarm.Builder setName(@Nullable String name) {
+        public Builder setName(@Nullable String name) {
             mName = name;
             return this;
         }
@@ -369,7 +333,7 @@
         }
 
         /**
-         * Sets the scheduled days for repeating the {@link Alarm}.
+         * Sets the scheduled days for repeating.
          *
          * <p>Days of the week can be {@link java.util.Calendar#MONDAY},
          * {@link java.util.Calendar#TUESDAY}, {@link java.util.Calendar#WEDNESDAY},
@@ -415,36 +379,47 @@
         }
 
         /**
-         * Sets the start time for the {@link Alarm} blackout period in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
+         * Sets the start date for the blackout period in ISO 8601 format.
+         * E.g.: 2022-01-14
          *
          * <p>A blackout period means the {@link Alarm} will not fire during this period.
          *
-         * <p>If not set, or set to 0, then the blackout period has no start time.
+         * <p>If not set, then it indicates that the blackout period has no start time.
          *
-         * <p>If neither blackoutStartTime nor blackoutEndTime are set, or if they are both set
-         * to 0, then the {@link Alarm} has no blackout period.
+         * <p>If neither blackoutPeriodStartDate and blackoutPeriodEndDate are set, then
+         * the blackout period is not defined.
          */
         @NonNull
-        public Builder setBlackoutStartTimeMillis(long blackoutStartTimeMillis) {
-            mBlackoutStartTimeMillis = blackoutStartTimeMillis;
+        public Builder setBlackoutPeriodStartDate(
+                @Nullable String blackoutPeriodStartDate) {
+            if (blackoutPeriodStartDate != null) {
+                Preconditions.checkArgument(
+                        DateTimeFormatValidator.validateISO8601Date(blackoutPeriodStartDate),
+                        "blackoutPeriodStartDate must be in the format: yyyy-MM-dd");
+            }
+            mBlackoutPeriodStartDate = blackoutPeriodStartDate;
             return this;
         }
 
         /**
-         * Sets the end time for the {@link Alarm} blackout period in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
+         * Sets the end time for the blackout period in ISO 8601 format.
+         * E.g.: 2022-01-14
          *
          * <p>A blackout period means the {@link Alarm} will not fire during this period.
          *
-         * <p>If not set, or set to 0, then the blackout period has no end time.
+         * <p>If not set, then it indicates that the blackout period has no end time.
          *
-         * <p>If neither blackoutStartTime nor blackoutEndTime are set, or if they are both set
-         * to 0, then the {@link Alarm} has no blackout period.
+         * <p>If neither blackoutPeriodStartDate and blackoutPeriodEndDate are set, then
+         * the blackout period is not defined.
          */
         @NonNull
-        public Builder setBlackoutEndTimeMillis(long blackoutEndTimeMillis) {
-            mBlackoutEndTimeMillis = blackoutEndTimeMillis;
+        public Builder setBlackoutPeriodEndDate(@Nullable String blackoutPeriodEndDate) {
+            if (blackoutPeriodEndDate != null) {
+                Preconditions.checkArgument(
+                        DateTimeFormatValidator.validateISO8601Date(blackoutPeriodEndDate),
+                        "blackoutPeriodEndDate must be in the format: yyyy-MM-dd");
+            }
+            mBlackoutPeriodEndDate = blackoutPeriodEndDate;
             return this;
         }
 
@@ -460,16 +435,16 @@
 
         /** Sets whether or not to activate the device vibrator when the {@link Alarm} fires. */
         @NonNull
-        public Builder setVibrate(boolean vibrate) {
-            mVibrate = vibrate;
+        public Builder setShouldVibrate(boolean shouldVibrate) {
+            mShouldVibrate = shouldVibrate;
             return this;
         }
 
         /**
-         * Sets the previous {@link AlarmInstance} associated with the {@link Alarm}.
+         * Sets the previous {@link AlarmInstance}.
          *
          * <p>The previous {@link AlarmInstance} is most recent past instance that was fired. If
-         * not set, then the {@link Alarm} has no past instances.
+         * not set, then there are no past instances.
          *
          * <p>See {@link AlarmInstance}.
          */
@@ -480,10 +455,10 @@
         }
 
         /**
-         * Sets the next {@link AlarmInstance} associated with the {@link Alarm}.
+         * Sets the next {@link AlarmInstance}.
          *
          * <p>The next {@link AlarmInstance} is the immediate future instance that is scheduled
-         * to fire. If not set, then the {@link Alarm} has no future instances.
+         * to fire. If not set, then there are no future instances.
          *
          * <p>See {@link AlarmInstance}.
          */
@@ -496,12 +471,10 @@
         /** Builds the {@link Alarm}. */
         @NonNull
         public Alarm build() {
-            Preconditions.checkNotNull(mId);
-            Preconditions.checkNotNull(mNamespace);
-
-            return new Alarm(mNamespace, mId, mScore, mCreationTimestampMillis, mTtlMillis, mName,
-                    mEnabled, mDaysOfWeek, mHour, mMinute, mBlackoutStartTimeMillis,
-                    mBlackoutEndTimeMillis, mRingtone, mVibrate, mPreviousInstance, mNextInstance);
+            return new Alarm(mNamespace, mId, mDocumentScore, mCreationTimestampMillis,
+                    mDocumentTtlMillis, mName, mEnabled, mDaysOfWeek, mHour, mMinute,
+                    mBlackoutPeriodStartDate, mBlackoutPeriodEndDate, mRingtone,
+                    mShouldVibrate, mPreviousInstance, mNextInstance);
         }
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java
index bf20151..e323b94 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/AlarmInstance.java

@@ -17,30 +17,29 @@
 package androidx.appsearch.builtintypes;
 
 import androidx.annotation.IntDef;
-import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.appsearch.annotation.Document;
+import androidx.appsearch.utils.DateTimeFormatValidator;
 import androidx.core.util.Preconditions;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Calendar;
 
 /**
- * AppSearch document representing an AlarmInstance entity.
+ * AppSearch document representing an {@link AlarmInstance} entity.
  *
  * <p>An {@link AlarmInstance} must be associated with an {@link Alarm}. It represents a
  * particular point in time for that Alarm. For example, if an Alarm is set to
- * repeat every Monday, then each AlarmInstance for it will be the exact Mondays that the Alarm
- * did trigger.
+ * repeat every Monday, then each {@link AlarmInstance} for it will be the exact Mondays that the
+ * Alarm did trigger.
  *
- * <p>Year, month, day, hour, and minute are used over timestamp to ensure the
- * {@link AlarmInstance} remains unchanged across timezones. E.g. An AlarmInstance set to fire at
- * 7am GMT should also fire at 7am when the timezone is changed to PST.
+ * <p>The scheduled time should be timezone independent so that it remains unchanged across
+ * timezones. E.g.: An {@link AlarmInstance} set to fire at 7am GMT should also fire at 7am when
+ * the timezone is changed to PST.
  */
 @Document(name = "builtin:AlarmInstance")
-public class AlarmInstance {
+public final class AlarmInstance {
     /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     @IntDef({STATUS_UNKNOWN, STATUS_SCHEDULED, STATUS_FIRING, STATUS_DISMISSED, STATUS_SNOOZED,
@@ -68,28 +67,16 @@
     private final String mId;
 
     @Document.Score
-    private final int mScore;
+    private final int mDocumentScore;
 
     @Document.CreationTimestampMillis
     private final long mCreationTimestampMillis;
 
     @Document.TtlMillis
-    private final long mTtlMillis;
+    private final long mDocumentTtlMillis;
 
-    @Document.LongProperty
-    private final int mYear;
-
-    @Document.LongProperty
-    private final int mMonth;
-
-    @Document.LongProperty
-    private final int mDay;
-
-    @Document.LongProperty
-    private final int mHour;
-
-    @Document.LongProperty
-    private final int mMinute;
+    @Document.StringProperty
+    private final String mScheduledTime;
 
     @Document.LongProperty
     private final int mStatus;
@@ -97,115 +84,88 @@
     @Document.LongProperty
     private final long mSnoozeDurationMillis;
 
-    AlarmInstance(String namespace, String id, int score, long creationTimestampMillis,
-            long ttlMillis, int year, int month, int day, int hour, int minute, int status,
-            long snoozeDurationMillis) {
-        mNamespace = namespace;
-        mId = id;
-        mScore = score;
+    AlarmInstance(@NonNull String namespace, @NonNull String id, int documentScore,
+            long creationTimestampMillis, long documentTtlMillis, @NonNull String scheduledTime,
+            int status, long snoozeDurationMillis) {
+        mNamespace = Preconditions.checkNotNull(namespace);
+        mId = Preconditions.checkNotNull(id);
+        mDocumentScore = documentScore;
         mCreationTimestampMillis = creationTimestampMillis;
-        mTtlMillis = ttlMillis;
-        mYear = year;
-        mMonth = month;
-        mDay = day;
-        mHour = hour;
-        mMinute = minute;
+        mDocumentTtlMillis = documentTtlMillis;
+        mScheduledTime = Preconditions.checkNotNull(scheduledTime);
         mStatus = status;
         mSnoozeDurationMillis = snoozeDurationMillis;
     }
 
-    /** Returns the namespace of the {@link AlarmInstance}. */
+    /** Returns the namespace. */
     @NonNull
     public String getNamespace() {
         return mNamespace;
     }
 
-    /** Returns the unique identifier of the {@link AlarmInstance}. */
+    /** Returns the unique identifier. */
     @NonNull
     public String getId() {
         return mId;
     }
 
     /**
-     * Returns the user-provided opaque document score of the {@link AlarmInstance}, which can be
-     * used for ranking using
+     * Returns the user-provided opaque document score of the current AppSearch document, which can
+     * be used for ranking using
      * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}.
+     *
+     * <p>See {@link Document.Score} for more information on score.
      */
-    public int getScore() {
-        return mScore;
+    public int getDocumentScore() {
+        return mDocumentScore;
     }
 
     /**
-     * Returns the creation timestamp for the {@link AlarmInstance} document, in milliseconds
-     * using the {@link System#currentTimeMillis()} time base.
+     * Returns the creation timestamp for the current AppSearch entity, in milliseconds using the
+     * {@link System#currentTimeMillis()} time base.
+     *
+     * <p>This timestamp refers to the creation time of the AppSearch entity, not when the
+     * document is written into AppSearch.
+     *
+     * <p>If not set, then the current timestamp will be used.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.CreationTimestampMillis} for more
+     * information on creation timestamp.
      */
     public long getCreationTimestampMillis() {
         return mCreationTimestampMillis;
     }
 
     /**
-     * Returns the time-to-live (TTL) for the {@link AlarmInstance} document in milliseconds using
-     * the {@link System#currentTimeMillis()} time base.
+     * Returns the time-to-live (TTL) for the current AppSearch document as a duration in
+     * milliseconds.
      *
-     * <p>The {@link AlarmInstance} document will be automatically deleted when the TTL expires.
+     * <p>The document will be automatically deleted when the TTL expires.
+     *
+     * <p>See {@link Document.TtlMillis} for more information on TTL.
      */
-    public long getTtlMillis() {
-        return mTtlMillis;
-    }
-
-    /** Returns the year {@link AlarmInstance} is scheduled to fire. */
-    public int getYear() {
-        return mYear;
+    public long getDocumentTtlMillis() {
+        return mDocumentTtlMillis;
     }
 
     /**
-     * Returns the month {@link AlarmInstance} is scheduled to fire.
+     * Returns the time that this is expected to fire in ISO 8601 format.
+     * E.g.: 2022-01-14T00:00:00
      *
-     * <p>Month should range from {@link java.util.Calendar#JANUARY} to
-     * {@link java.util.Calendar#DECEMBER}.
+     * <p>The scheduledTime is a timezone independent date time. When used, it should be
+     * converted into a date time in the local timezone.
      */
-    @IntRange(from = Calendar.JANUARY, to = Calendar.DECEMBER)
-    public int getMonth() {
-        return mMonth;
+    @NonNull
+    public String getScheduledTime() {
+        return mScheduledTime;
     }
 
     /**
-     * Returns the day of the month {@link AlarmInstance} is scheduled to fire.
+     * Returns the current status.
      *
-     * <p>Days are specified by integers from 1 to 31.
-     */
-    @IntRange(from = 1, to = 31)
-    public int getDay() {
-        return mDay;
-    }
-
-    /**
-     * Returns the hour {@link AlarmInstance} is scheduled to fire.
-     *
-     * <p>Hours are specified by integers from 0 to 23.
-     */
-    @IntRange(from = 0, to = 23)
-    public int getHour() {
-        return mHour;
-    }
-
-    /**
-     * Returns the minute {@link AlarmInstance} is scheduled to fire.
-     *
-     * <p>Minutes are specified by integers from 0 to 59.
-     */
-    @IntRange(from = 0, to = 59)
-    public int getMinute() {
-        return mMinute;
-    }
-
-    /**
-     * Returns the current status of the {@link AlarmInstance}.
-     *
-     * <p>Status can be either {@link AlarmInstance#STATUS_UNKNOWN},
-     * {@link AlarmInstance#STATUS_SCHEDULED}, {@link AlarmInstance#STATUS_FIRING},
-     * {@link AlarmInstance#STATUS_DISMISSED}, {@link AlarmInstance#STATUS_SNOOZED}, or
-     * {@link AlarmInstance#STATUS_MISSED}.
+     * <p>Status can be either {@link #STATUS_UNKNOWN}, {@link #STATUS_SCHEDULED},
+     * {@link #STATUS_FIRING}, {@link #STATUS_DISMISSED}, {@link #STATUS_SNOOZED}, or
+     * {@link #STATUS_MISSED}.
      */
     @Status
     public int getStatus() {
@@ -214,168 +174,60 @@
 
     /**
      * Returns the length of time in milliseconds the {@link AlarmInstance} will remain snoozed
-     * before it fires again, or -1 if the {@link AlarmInstance} does not support snoozing.
+     * before it fires again, or -1 if it does not support snoozing.
      */
     public long getSnoozeDurationMillis() {
         return mSnoozeDurationMillis;
     }
 
     /** Builder for {@link AlarmInstance}. */
-    public static final class Builder {
-        private final String mNamespace;
-        private final String mId;
-        private int mScore;
-        private long mCreationTimestampMillis;
-        private long mTtlMillis;
-        private int mYear;
-        private int mMonth;
-        private int mDay;
-        private int mHour;
-        private int mMinute;
+    public static final class Builder extends BaseBuiltinTypeBuilder<Builder> {
+        private final String mScheduledTime;
         private int mStatus;
         private long mSnoozeDurationMillis;
 
         /**
          * Constructor for {@link AlarmInstance.Builder}.
          *
-         * @param namespace Namespace for the {@link AlarmInstance} Document. See
-         * {@link Document.Namespace}.
-         * @param id Unique identifier for the {@link AlarmInstance} Document. See
-         * {@link Document.Id}.
+         * @param namespace Namespace for the Document. See {@link Document.Namespace}.
+         * @param id Unique identifier for the Document. See {@link Document.Id}.
+         * @param scheduledTime The time that this is expected to fire in
+         *                      ISO 8601 format. E.g.: 2022-01-14T00:00:00. Scheduled time should
+         *                      be timezone independent.
          */
-        public Builder(@NonNull String namespace, @NonNull String id) {
-            mNamespace = Preconditions.checkNotNull(namespace);
-            mId = Preconditions.checkNotNull(id);
+        public Builder(@NonNull String namespace, @NonNull String id,
+                @NonNull String scheduledTime) {
+            super(namespace, id);
+            Preconditions.checkNotNull(scheduledTime);
+            Preconditions.checkArgument(
+                    DateTimeFormatValidator.validateISO8601DateTime(scheduledTime),
+                    "scheduledTime must be in the format: yyyy-MM-ddTHH:mm:ss");
 
-            // Default for unset creationTimestampMillis. AppSearch will internally convert this
-            // to current time when creating the GenericDocument.
-            mCreationTimestampMillis = -1;
+            mScheduledTime = scheduledTime;
+
             // default for snooze length. Indicates no snoozing.
             mSnoozeDurationMillis = -1;
         }
 
         /**
-         * Constructor for {@link AlarmInstance.Builder} with all the existing values of an
-         * {@link AlarmInstance}.
+         * Constructor for {@link AlarmInstance.Builder} with all the existing values.
          */
         public Builder(@NonNull AlarmInstance alarmInstance) {
-            this(alarmInstance.getNamespace(), alarmInstance.getId());
-            mScore = alarmInstance.getScore();
+            this(alarmInstance.getNamespace(), alarmInstance.getId(),
+                    alarmInstance.getScheduledTime());
+            mDocumentScore = alarmInstance.getDocumentScore();
             mCreationTimestampMillis = alarmInstance.getCreationTimestampMillis();
-            mTtlMillis = alarmInstance.getTtlMillis();
-            mYear = alarmInstance.getYear();
-            mMonth = alarmInstance.getMonth();
-            mDay = alarmInstance.getDay();
-            mHour = alarmInstance.getHour();
-            mMinute = alarmInstance.getMinute();
+            mDocumentTtlMillis = alarmInstance.getDocumentTtlMillis();
             mStatus = alarmInstance.getStatus();
             mSnoozeDurationMillis = alarmInstance.getSnoozeDurationMillis();
         }
 
         /**
-         * Sets the opaque document score of the {@link AlarmInstance}, which can be used for
-         * ranking using
-         * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}
+         * Sets the current status.
          *
-         * <p>See {@link Document.Score}
-         */
-        @NonNull
-        public Builder setScore(int score) {
-            mScore = score;
-            return this;
-        }
-
-        /**
-         * Sets the Creation Timestamp of the {@link AlarmInstance} document, in milliseconds
-         * using the {@link System#currentTimeMillis()} time base.
-         *
-         * <p>If not set, then the current timestamp will be used.
-         *
-         * <p>See {@link Document.CreationTimestampMillis}
-         */
-        @NonNull
-        public Builder setCreationTimestampMillis(long creationTimestampMillis) {
-            mCreationTimestampMillis = creationTimestampMillis;
-            return this;
-        }
-
-        /**
-         * Sets the time-to-live (TTL) for the {@link AlarmInstance} document in milliseconds using
-         * the {@link System#currentTimeMillis()} time base.
-         *
-         * <p>The {@link AlarmInstance} document will be automatically deleted when the TTL expires.
-         *
-         * <p>If set to 0, then the document will never expire.
-         *
-         * <p>See {@link Document.TtlMillis}
-         */
-        @NonNull
-        public Builder setTtlMillis(long ttlMillis) {
-            mTtlMillis = ttlMillis;
-            return this;
-        }
-
-        /** Sets the year {@link AlarmInstance} is scheduled to fire. */
-        @NonNull
-        public Builder setYear(int year) {
-            mYear = year;
-            return this;
-        }
-
-        /**
-         * Sets the month {@link AlarmInstance} is scheduled to fire.
-         *
-         * <p>Month should range from {@link java.util.Calendar#JANUARY} to
-         * {@link java.util.Calendar#DECEMBER}.
-         */
-        @NonNull
-        public Builder setMonth(
-                @IntRange(from = Calendar.JANUARY, to = Calendar.DECEMBER) int month) {
-            mMonth = Preconditions.checkArgumentInRange(month, Calendar.JANUARY,
-                    Calendar.DECEMBER, "month");
-            return this;
-        }
-
-        /**
-         * Sets the day of the month {@link AlarmInstance} is scheduled to fire.
-         *
-         * <p>Days are specified by integers from 1 to 31.
-         */
-        @NonNull
-        public Builder setDay(@IntRange(from = 1, to = 31) int day) {
-            mDay = Preconditions.checkArgumentInRange(day, 1, 31, "day");
-            return this;
-        }
-
-        /**
-         * Sets the hour {@link AlarmInstance} is scheduled to fire.
-         *
-         * <p>Hours are specified by integers from 0 to 23.
-         */
-        @NonNull
-        public Builder setHour(@IntRange(from = 0, to = 23) int hour) {
-            mHour = Preconditions.checkArgumentInRange(hour, 0, 23, "hour");
-            return this;
-        }
-
-        /**
-         * Sets the minute {@link AlarmInstance} is scheduled to fire.
-         *
-         * <p>Minutes are specified by integers from 0 to 59.
-         */
-        @NonNull
-        public Builder setMinute(@IntRange(from = 0, to = 59) int minute) {
-            mMinute = Preconditions.checkArgumentInRange(minute, 0, 59, "minute");
-            return this;
-        }
-
-        /**
-         * Sets the current status of the {@link AlarmInstance}.
-         *
-         * <p>Status can be either {@link AlarmInstance#STATUS_UNKNOWN},
-         * {@link AlarmInstance#STATUS_SCHEDULED}, {@link AlarmInstance#STATUS_FIRING},
-         * {@link AlarmInstance#STATUS_DISMISSED}, {@link AlarmInstance#STATUS_SNOOZED}, or
-         * {@link AlarmInstance#STATUS_MISSED}.
+         * <p>Status can be either {@link #STATUS_UNKNOWN}, {@link #STATUS_SCHEDULED},
+         * {@link #STATUS_FIRING}, {@link #STATUS_DISMISSED}, {@link #STATUS_SNOOZED}, or
+         * {@link #STATUS_MISSED}.
          */
         @NonNull
         public Builder setStatus(@Status int status) {
@@ -387,7 +239,7 @@
          * Sets the length of time in milliseconds the {@link AlarmInstance} will remain snoozed
          * before it fires again.
          *
-         * <p>If not set, or set to -1, then the {@link AlarmInstance} does not support snoozing.
+         * <p>If not set, or set to -1, then it does not support snoozing.
          */
         @NonNull
         public Builder setSnoozeDurationMillis(long snoozeDurationMillis) {
@@ -398,11 +250,9 @@
         /** Builds the {@link AlarmInstance}. */
         @NonNull
         public AlarmInstance build() {
-            Preconditions.checkNotNull(mId);
-            Preconditions.checkNotNull(mNamespace);
-
-            return new AlarmInstance(mNamespace, mId, mScore, mCreationTimestampMillis, mTtlMillis,
-                    mYear, mMonth, mDay, mHour, mMinute, mStatus, mSnoozeDurationMillis);
+            return new AlarmInstance(mNamespace, mId, mDocumentScore,
+                    mCreationTimestampMillis, mDocumentTtlMillis, mScheduledTime, mStatus,
+                    mSnoozeDurationMillis);
         }
     }
 }

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.appsearch.builtintypes;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Preconditions;
+
+/**
+ * Default Builder for an AppSearch built in type. This builder includes all the default
+ * AppSearch properties.
+ */
+abstract class BaseBuiltinTypeBuilder<T extends BaseBuiltinTypeBuilder<T>> {
+    protected final String mNamespace;
+    protected final String mId;
+    protected int mDocumentScore;
+    protected long mCreationTimestampMillis;
+    protected long mDocumentTtlMillis;
+
+    protected BaseBuiltinTypeBuilder(@NonNull String namespace, @NonNull String id) {
+        mNamespace = Preconditions.checkNotNull(namespace);
+        mId = Preconditions.checkNotNull(id);
+
+        // Default for unset creationTimestampMillis. AppSearch will internally convert this
+        // to current time when creating the GenericDocument.
+        mCreationTimestampMillis = -1;
+    }
+
+    /**
+     * Sets the user-provided opaque document score of the current AppSearch document, which can
+     * be used for ranking using
+     * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.Score} for more information on score.
+     */
+    @NonNull
+    @SuppressWarnings("unchecked")
+    public T setDocumentScore(int documentScore) {
+        mDocumentScore = documentScore;
+        return (T) this;
+    }
+
+    /**
+     * Sets the creation timestamp for the current AppSearch entity, in milliseconds using the
+     * {@link System#currentTimeMillis()} time base.
+     *
+     * <p>This timestamp refers to the creation time of the AppSearch entity, not when the
+     * document is written into AppSearch.
+     *
+     * <p>If not set, then the current timestamp will be used.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.CreationTimestampMillis} for more
+     * information on creation timestamp.
+     */
+    @NonNull
+    @SuppressWarnings("unchecked")
+    public T setCreationTimestampMillis(long creationTimestampMillis) {
+        mCreationTimestampMillis = creationTimestampMillis;
+        return (T) this;
+    }
+
+    /**
+     * Sets the time-to-live (TTL) for the current AppSearch document as a duration in milliseconds.
+     *
+     * <p>The document will be automatically deleted when the TTL expires.
+     *
+     * <p>If not set, then the document will never expire.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.TtlMillis} for more information on
+     * TTL.
+     */
+    @NonNull
+    @SuppressWarnings("unchecked")
+    public T setDocumentTtlMillis(long documentTtlMillis) {
+        mDocumentTtlMillis = documentTtlMillis;
+        return (T) this;
+    }
+}

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
index 0bac43d..d2015d1 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java

@@ -16,11 +16,16 @@
 
 package androidx.appsearch.builtintypes;
 
+import android.content.Context;
+import android.os.Build;
 import android.os.SystemClock;
+import android.provider.Settings;
 
+import androidx.annotation.DoNotInline;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.appsearch.annotation.Document;
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
@@ -30,10 +35,10 @@
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * AppSearch document representing a Timer entity.
+ * AppSearch document representing a {@link Timer} entity.
  */
 @Document(name = "builtin:Timer")
-public class Timer {
+public final class Timer {
     /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     @IntDef({STATUS_UNKNOWN, STATUS_STARTED, STATUS_PAUSED, STATUS_EXPIRED, STATUS_MISSED,
@@ -61,13 +66,13 @@
     private final String mId;
 
     @Document.Score
-    private final int mScore;
+    private final int mDocumentScore;
 
     @Document.CreationTimestampMillis
     private final long mCreationTimestampMillis;
 
     @Document.TtlMillis
-    private final long mTtlMillis;
+    private final long mDocumentTtlMillis;
 
     @Document.StringProperty(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
     private final String mName;
@@ -76,13 +81,19 @@
     private final long mDurationMillis;
 
     @Document.LongProperty
+    private final long mOriginalDurationMillis;
+
+    @Document.LongProperty
     private final long mStartTimeMillis;
 
     @Document.LongProperty
     private final long mStartTimeMillisInElapsedRealtime;
 
     @Document.LongProperty
-    private final long mRemainingTimeMillis;
+    private final int mBootCount;
+
+    @Document.LongProperty
+    private final long mRemainingTimeMillisSinceUpdate;
 
     @Document.StringProperty
     private final String mRingtone;
@@ -91,142 +102,164 @@
     private final int mStatus;
 
     @Document.BooleanProperty
-    private final boolean mVibrate;
+    private final boolean mShouldVibrate;
 
-    Timer(String namespace, String id, int score, long creationTimestampMillis, long ttlMillis,
-            String name, long durationMillis, long startTimeMillis,
-            long startTimeMillisInElapsedRealtime, long remainingTimeMillis, String ringtone,
-            int status, boolean vibrate) {
-        mNamespace = namespace;
-        mId = id;
-        mScore = score;
+    Timer(@NonNull String namespace, @NonNull String id, int documentScore,
+            long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
+            long durationMillis, long originalDurationMillis, long startTimeMillis,
+            long startTimeMillisInElapsedRealtime, int bootCount,
+            long remainingTimeMillisSinceUpdate, @Nullable String ringtone, int status,
+            boolean shouldVibrate) {
+        mNamespace = Preconditions.checkNotNull(namespace);
+        mId = Preconditions.checkNotNull(id);
+        mDocumentScore = documentScore;
         mCreationTimestampMillis = creationTimestampMillis;
-        mTtlMillis = ttlMillis;
+        mDocumentTtlMillis = documentTtlMillis;
         mName = name;
         mDurationMillis = durationMillis;
+        mOriginalDurationMillis = originalDurationMillis;
         mStartTimeMillis = startTimeMillis;
         mStartTimeMillisInElapsedRealtime = startTimeMillisInElapsedRealtime;
-        mRemainingTimeMillis = remainingTimeMillis;
+        mBootCount = bootCount;
+        mRemainingTimeMillisSinceUpdate = remainingTimeMillisSinceUpdate;
         mRingtone = ringtone;
         mStatus = status;
-        mVibrate = vibrate;
+        mShouldVibrate = shouldVibrate;
     }
 
-    /** Returns the namespace of the {@link Timer}. */
+    /** Returns the namespace. */
     @NonNull
     public String getNamespace() {
         return mNamespace;
     }
 
-    /** Returns the unique identifier of the {@link Timer}. */
+    /** Returns the unique identifier. */
     @NonNull
     public String getId() {
         return mId;
     }
 
     /**
-     * Returns the user-provided opaque document score of the {@link Timer}, which can be used for
-     * ranking using
-     * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}
+     * Returns the user-provided opaque document score of the current AppSearch document, which can
+     * be used for ranking using
+     * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}.
+     *
+     * <p>See {@link Document.Score} for more information on score.
      */
-    public int getScore() {
-        return mScore;
+    public int getDocumentScore() {
+        return mDocumentScore;
     }
 
     /**
-     * Returns the creation timestamp for the {@link Timer} document, in milliseconds using the
+     * Returns the creation timestamp for the current AppSearch entity, in milliseconds using the
      * {@link System#currentTimeMillis()} time base.
+     *
+     * <p>This timestamp refers to the creation time of the AppSearch entity, not when the
+     * document is written into AppSearch.
+     *
+     * <p>If not set, then the current timestamp will be used.
+     *
+     * <p>See {@link androidx.appsearch.annotation.Document.CreationTimestampMillis} for more
+     * information on creation timestamp.
      */
     public long getCreationTimestampMillis() {
         return mCreationTimestampMillis;
     }
 
     /**
-     * Returns the time-to-live (TTL) for the {@link Timer} document in milliseconds using the
-     * {@link System#currentTimeMillis()} time base.
+     * Returns the time-to-live (TTL) for the current AppSearch document as a duration in
+     * milliseconds.
      *
-     * <p>The {@link Timer} document will be automatically deleted when the TTL expires.
+     * <p>The document will be automatically deleted when the TTL expires.
+     *
+     * <p>See {@link Document.TtlMillis} for more information on TTL.
      */
-    public long getTtlMillis() {
-        return mTtlMillis;
+    public long getDocumentTtlMillis() {
+        return mDocumentTtlMillis;
     }
 
-    /** Returns the name associated with the {@link Timer}. */
+    /** Returns the name. */
     @Nullable
     public String getName() {
         return mName;
     }
 
     /**
-     * Returns the total duration of the {@link Timer}, in milliseconds.
+     * Returns the total duration in milliseconds, including additional time added by the user.
+     *
+     * <p>Applications may allow the user to add additional durations. The durationMillis will
+     * always return the new updated duration.
      */
     public long getDurationMillis() {
         return mDurationMillis;
     }
 
     /**
-     * Returns the time at which the {@link Timer} was started in milliseconds using the
-     * {@link System#currentTimeMillis()} time base.
+     * Returns the original duration in milliseconds when the {@link Timer} was first created.
      *
+     * <p>Applications may allow the user to add additional durations. The
+     * originalDurationMillis will always return the original duration before any change has
+     * taken place.
+     */
+    public long getOriginalDurationMillis() {
+        return mOriginalDurationMillis;
+    }
+
+    /**
+     * Returns the most recent time that the status transitioned to {@link #STATUS_STARTED}. In
+     * milliseconds using the {@link System#currentTimeMillis()} time base.
      *
-     * <p>If the {@link Timer} is in a {@link Timer#STATUS_STARTED} state, then its expire time
-     * can be calculated using:
-     * <pre>{@code
-     * long expireTime = timer.getStartTimeMillis + timer.getRemainingTimeMillis();
-     * }</pre>
+     * <p>If the status is not {@link #STATUS_STARTED}, then this value is undefined, and
+     * should not be used.
      *
-     * <p>See {@link #getStartTimeMillisInElapsedRealtime()} to see how startTimeMillis and
-     * startTimeMillisInElapsedRealtime should be used.
+     * <p>This value is used to calculate {@link #getExpirationTimeMillis(Context)}.
      */
     public long getStartTimeMillis() {
         return mStartTimeMillis;
     }
 
     /**
-     * Returns the time at which the {@link Timer} was started in milliseconds using the
-     * {@link android.os.SystemClock#elapsedRealtime()} time base, or -1 if not present.
+     * Returns the most recent real time that the status transitioned to {@link #STATUS_STARTED}.
+     * In milliseconds using the {@link android.os.SystemClock#elapsedRealtime()} time base.
      *
-     * <p>If present, startTimeMillisInElapsedRealtime should be the preferred value used to do
-     * accurate time keeping in {@link Timer}.
+     * <p>If the status is not {@link #STATUS_STARTED}, then this value is undefined, and
+     * should not be used.
      *
-     * <p>If not present, or if {@link SystemClock#elapsedRealtime()} is unreliable, for example
-     * after a device reboot, or the {@link Timer} document is moved to a different device, then
-     * startTimeMillis should be used instead for time keeping.
-     *
-     * <p>If the {@link Timer} is in a {@link Timer#STATUS_STARTED} state, then its expire time
-     * can be calculated using:
-     * <pre>{@code
-     * long elapsedTime = SystemClock.elapsedRealtime() -
-     *   timer.getStartTimeMillisInElapsedRealtime();
-     * long expireTime = System.currentTimeMillis() + timer.getRemainingTimeMillis() - elapsedTime;
-     * }</pre>
+     * <p>This value is used to calculate {@link #getExpirationTimeMillis(Context)}.
      */
     public long getStartTimeMillisInElapsedRealtime() {
         return mStartTimeMillisInElapsedRealtime;
     }
 
     /**
-     * Returns the amount of time remaining when the {@link Timer} was started, paused or reset,
-     * in milliseconds.
+     * Returns the boot count of the device when this document is last updated.
      *
-     * <p>The current remaining time can also be calculate using either
-     * {@link #getStartTimeMillis()} or {@link #getStartTimeMillisInElapsedRealtime()}:
-     * <pre>{@code
-     * long elapsedTime = System.currentTimeMillis() - timer.getStartTimeMillis();
-     * long currentRemainingTime = timer.getRemainingTimeMillis() - elapsedTime;
-     * }</pre>
-     * <pre>{@code
-     * long elapsedTime = SystemClock.elapsedRealtime() -
-     *   timer.getStartTimeMillisInElapsedRealtime();
-     * long currentRemainingTime = timer.getRemainingTimeMillis() - elapsedTime;
-     * }</pre>
+     * <p>The boot count of the device can be accessed from Global Settings. See
+     * {@link android.provider.Settings.Global#BOOT_COUNT}.
+     *
+     * <p>On older APIs where boot count is not available, this value should not be used.
+     *
+     * <p>If available, this value is used to calculate {@link #getExpirationTimeMillis(Context)}
+     * and {@link #getCurrentRemainingTime(Context)}.
      */
-    public long getRemainingTimeMillis() {
-        return mRemainingTimeMillis;
+    public int getBootCount() {
+        return mBootCount;
     }
 
     /**
-     * Returns the ringtone of the {@link Timer} as a content URI to be played, or
+     * Returns the amount of time remaining in milliseconds for the {@link Timer} since it was
+     * started, paused or reset.
+     *
+     * <p>If it is in the {@link #STATUS_STARTED} state, then the current remaining time will be
+     * different from this value. To get the current remaining time, use
+     * {@link #getCurrentRemainingTime(Context)}.
+     */
+    public long getRemainingTimeMillisSinceUpdate() {
+        return mRemainingTimeMillisSinceUpdate;
+    }
+
+    /**
+     * Returns the ringtone as a content URI to be played, or
      * {@link android.provider.AlarmClock#VALUE_RINGTONE_SILENT} if no ringtone will be played.
      */
     @Nullable
@@ -235,11 +268,10 @@
     }
 
     /**
-     * Returns the current status of the {@link Timer}.
+     * Returns the current status.
      *
-     * <p>Status can be {@link Timer#STATUS_UNKNOWN}, {@link Timer#STATUS_STARTED},
-     * {@link Timer#STATUS_PAUSED}, {@link Timer#STATUS_EXPIRED}, {@link Timer#STATUS_MISSED}, or
-     * {@link Timer#STATUS_RESET}.
+     * <p>Status can be {@link #STATUS_UNKNOWN}, {@link #STATUS_STARTED}, {@link #STATUS_PAUSED},
+     * {@link #STATUS_EXPIRED}, {@link #STATUS_MISSED}, or {@link #STATUS_RESET}.
      */
     @Status
     public int getStatus() {
@@ -247,102 +279,128 @@
     }
 
     /** Returns whether or not to activate the device vibrator when the {@link Timer} expires. */
-    public boolean isVibrate() {
-        return mVibrate;
+    public boolean shouldVibrate() {
+        return mShouldVibrate;
+    }
+
+    /**
+     * Calculates the expire time in milliseconds in the {@link System#currentTimeMillis()} time
+     * base.
+     *
+     * <p>{@link Long#MAX_VALUE} will be returned if the {@link Timer} is {@link #STATUS_PAUSED}
+     * or {@link #STATUS_RESET}.
+     *
+     * <p>A negative value may be returned if the {@link Timer} is {@link #STATUS_MISSED} or
+     * {@link #STATUS_EXPIRED} to indicate it expired in the past.
+     *
+     * @param context The app context
+     */
+    public long getExpirationTimeMillis(@NonNull Context context) {
+        if (mStatus == STATUS_PAUSED || mStatus == STATUS_RESET) {
+            return Long.MAX_VALUE;
+        }
+
+        int currentBootCount = -1;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            currentBootCount = Api17Impl.getCurrentBootCount(context);
+        }
+
+        if (currentBootCount == -1 || currentBootCount != mBootCount) {
+            // Boot count doesn't exist or doesn't match current device boot count. Use wall
+            // clock time since elapsed realtime is no longer valid.
+            return mStartTimeMillis + mRemainingTimeMillisSinceUpdate;
+        } else {
+            // Boot count matches current device boot count. Therefore we can use elapsed
+            // realtime to do calculations.
+            long elapsedTime = SystemClock.elapsedRealtime() - mStartTimeMillisInElapsedRealtime;
+            return System.currentTimeMillis() + mRemainingTimeMillisSinceUpdate - elapsedTime;
+        }
+    }
+
+    /**
+     * Calculates the current remaining time in milliseconds.
+     *
+     * <p>A negative value may be returned if the {@link Timer} is {@link #STATUS_MISSED} or
+     * {@link #STATUS_EXPIRED} to indicate it has already fired.
+     *
+     * @param context The app context
+     */
+    public long getCurrentRemainingTime(@NonNull Context context) {
+        if (mStatus == STATUS_PAUSED || mStatus == STATUS_RESET) {
+            // The timer has not started, so the remaining time is the same as the last updated one.
+            return mRemainingTimeMillisSinceUpdate;
+        }
+
+        int currentBootCount = -1;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            currentBootCount = Api17Impl.getCurrentBootCount(context);
+        }
+
+        long elapsedTime;
+        if (currentBootCount == -1 || currentBootCount != mBootCount) {
+            // Boot count doesn't exist or doesn't match current device boot count. Use wall
+            // clock time since elapsed realtime is no longer valid.
+            elapsedTime = System.currentTimeMillis() - mStartTimeMillis;
+        } else {
+            // Boot count matches current device boot count. Therefore we can use elapsed
+            // realtime to do calculations.
+            elapsedTime = SystemClock.elapsedRealtime() - mStartTimeMillisInElapsedRealtime;
+        }
+        return mRemainingTimeMillisSinceUpdate - elapsedTime;
+    }
+
+    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    private static final class Api17Impl {
+        @DoNotInline
+        static int getCurrentBootCount(@NonNull Context context) {
+            return Settings.Global.getInt(context.getContentResolver(),
+                    Settings.Global.BOOT_COUNT, -1);
+        }
+
+        private Api17Impl() {}
     }
 
     /** Builder for {@link Timer}. */
-    public static final class Builder {
-        private final String mNamespace;
-        private final String mId;
-        private int mScore;
-        private long mCreationTimestampMillis;
-        private long mTtlMillis;
+    public static final class Builder extends BaseBuiltinTypeBuilder<Builder> {
         private String mName;
         private long mDurationMillis;
+        private long mOriginalDurationMillis;
         private long mStartTimeMillis;
         private long mStartTimeMillisInElapsedRealtime;
-        private long mRemainingTimeMillis;
+        private int mBootCount;
+        private long mRemainingTimeMillisSinceUpdate;
         private String mRingtone;
         private int mStatus;
-        private boolean mVibrate;
+        private boolean mShouldVibrate;
 
         /**
          * Constructor for {@link Timer.Builder}.
          *
-         * @param namespace Namespace for the {@link Timer} Document. See
-         * {@link Document.Namespace}.
-         * @param id Unique identifier for the {@link Timer} Document. See {@link Document.Id}.
+         * @param namespace Namespace for the Document. See {@link Document.Namespace}.
+         * @param id Unique identifier for the Document. See {@link Document.Id}.
          */
         public Builder(@NonNull String namespace, @NonNull String id) {
-            mNamespace = Preconditions.checkNotNull(namespace);
-            mId = Preconditions.checkNotNull(id);
-
-            // Default for unset creationTimestampMillis. AppSearch will internally convert this
-            // to current time when creating the GenericDocument.
-            mCreationTimestampMillis = -1;
-            // Default for unset startTimeMillisInElapsedRealtime
-            mStartTimeMillisInElapsedRealtime = -1;
+            super(namespace, id);
         }
 
         /**
-         * Constructor for {@link Timer.Builder} with all the existing values of a {@link Timer}.
+         * Constructor for {@link Timer.Builder} with all the existing values.
          */
         public Builder(@NonNull Timer timer) {
             this(timer.getNamespace(), timer.getId());
-            mScore = timer.getScore();
+            mDocumentScore = timer.getDocumentScore();
             mCreationTimestampMillis = timer.getCreationTimestampMillis();
-            mTtlMillis = timer.getTtlMillis();
+            mDocumentTtlMillis = timer.getDocumentTtlMillis();
             mName = timer.getName();
             mDurationMillis = timer.getDurationMillis();
+            mOriginalDurationMillis = timer.getOriginalDurationMillis();
             mStartTimeMillis = timer.getStartTimeMillis();
             mStartTimeMillisInElapsedRealtime = timer.getStartTimeMillisInElapsedRealtime();
-            mRemainingTimeMillis = timer.getRemainingTimeMillis();
+            mBootCount = timer.getBootCount();
+            mRemainingTimeMillisSinceUpdate = timer.getRemainingTimeMillisSinceUpdate();
             mRingtone = timer.getRingtone();
             mStatus = timer.getStatus();
-            mVibrate = timer.isVibrate();
-        }
-
-        /**
-         * Sets the opaque document score of the {@link Timer}, which can be used for ranking using
-         * {@link androidx.appsearch.app.SearchSpec.RankingStrategy#RANKING_STRATEGY_DOCUMENT_SCORE}
-         *
-         * <p>See {@link Document.Score}
-         */
-        @NonNull
-        public Builder setScore(int score) {
-            mScore = score;
-            return this;
-        }
-
-        /**
-         * Sets the creation timestamp of the {@link Timer} document, in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
-         *
-         * <p>If not set, then the current timestamp will be used.
-         *
-         * <p>See {@link Document.CreationTimestampMillis}
-         */
-        @NonNull
-        public Builder setCreationTimestampMillis(long creationTimestampMillis) {
-            mCreationTimestampMillis = creationTimestampMillis;
-            return this;
-        }
-
-        /**
-         * Sets the time-to-live (TTL) for the {@link Timer} document in milliseconds using the
-         * {@link System#currentTimeMillis()} time base.
-         *
-         * <p>The {@link Timer} document will be automatically deleted when the TTL expires.
-         *
-         * <p>If not set, then the document will never expire.
-         *
-         * <p>See {@link Document.TtlMillis}
-         */
-        @NonNull
-        public Builder setTtlMillis(long ttlMillis) {
-            mTtlMillis = ttlMillis;
-            return this;
+            mShouldVibrate = timer.shouldVibrate();
         }
 
         /** Sets the name. */
@@ -353,7 +411,7 @@
         }
 
         /**
-         * Sets the total duration of the {@link Timer}, in milliseconds.
+         * Sets the total duration in milliseconds, including additional time added by the user.
          */
         @NonNull
         public Builder setDurationMillis(long durationMillis) {
@@ -362,44 +420,64 @@
         }
 
         /**
-         * Sets the time at which the {@link Timer} was started in milliseconds using the
+         * Sets the original duration in milliseconds when the {@link Timer} was first created.
+         */
+        @NonNull
+        public Builder setOriginalDurationMillis(long originalDurationMillis) {
+            mOriginalDurationMillis = originalDurationMillis;
+            return this;
+        }
+
+        /**
+         * Sets the most recent time that the status transitioned to {@link #STATUS_STARTED}.
+         *
+         * <p> Start time should be sampled in both the {@link System#currentTimeMillis()} and
+         * {@link android.os.SystemClock#elapsedRealtime()} time base. In addition, the boot
+         * count of the device is needed to check if the
+         * {@link android.os.SystemClock#elapsedRealtime()} time base is valid.
+         *
+         * @param startTimeMillis The start time in milliseconds using the
          * {@link System#currentTimeMillis()} time base.
-         *
-         * <p>See {@link #setStartTimeMillisInElapsedRealtime(long)} on how startTimeMillis and
-         * startTimeMillisInElapsedRealtime should be used.
-         */
-        @NonNull
-        public Builder setStartTimeMillis(long startTimeMillis) {
-            mStartTimeMillis = startTimeMillis;
-            return this;
-        }
-
-        /**
-         * Sets the time at which the {@link Timer} was started in milliseconds using the
+         * @param startTimeMillisInElapsedRealtime The start time in milliseconds using the
          * {@link android.os.SystemClock#elapsedRealtime()} time base.
-         *
-         * <p>startTimeMillis and startTimeMillisInElapsedRealtime should be sampled at
-         * the same time, using {@link System#currentTimeMillis()} and
-         * {@link android.os.SystemClock#elapsedRealtime()} respectively.
-         *
-         * <p>In situations where the reader cannot reliably use
-         * {@link android.os.SystemClock#elapsedRealtime()}, for example if the reader is not on
-         * the same device where the {@link Timer} document is written, then
-         * startTimeMillisInElapsedRealtime should not be set.
+         * @param bootCount The current boot count of the device. See
+         * {@link android.provider.Settings.Global#BOOT_COUNT}.
          */
         @NonNull
-        public Builder setStartTimeMillisInElapsedRealtime(long startTimeMillisInElapsedRealtime) {
+        public Builder setStartTimeMillis(long startTimeMillis,
+                long startTimeMillisInElapsedRealtime, int bootCount) {
+            mStartTimeMillis = startTimeMillis;
             mStartTimeMillisInElapsedRealtime = startTimeMillisInElapsedRealtime;
+            mBootCount = bootCount;
             return this;
         }
 
         /**
-         * Sets the amount of time remaining when the {@link Timer} was started, paused or reset,
-         * in milliseconds.
+         * Sets the most recent time that the status transitioned to {@link #STATUS_STARTED}.
+         *
+         * <p>See {@link #setStartTimeMillis(long, long, int)}.
+         *
+         * @param context The app context used to fetch boot count.
+         * @param startTimeMillis The start time in milliseconds using the
+         * {@link System#currentTimeMillis()} time base.
+         * @param startTimeMillisInElapsedRealtime The start time in milliseconds using the
+         * {@link android.os.SystemClock#elapsedRealtime()} time base.
+         */
+        @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+        @NonNull
+        public Builder setStartTimeMillis(@NonNull Context context, long startTimeMillis,
+                long startTimeMillisInElapsedRealtime) {
+            int bootCount = Api17Impl.getCurrentBootCount(context);
+            return setStartTimeMillis(startTimeMillis, startTimeMillisInElapsedRealtime, bootCount);
+        }
+
+        /**
+         * Sets the amount of time remaining in milliseconds for the {@link Timer} since it was
+         * started, paused or reset.
          */
         @NonNull
-        public Builder setRemainingTimeMillis(long remainingTimeMillis) {
-            mRemainingTimeMillis = remainingTimeMillis;
+        public Builder setRemainingTimeMillisSinceUpdate(long remainingTimeMillisSinceUpdate) {
+            mRemainingTimeMillisSinceUpdate = remainingTimeMillisSinceUpdate;
             return this;
         }
 
@@ -414,11 +492,11 @@
         }
 
         /**
-         * Sets the current status of the {@link Timer}.
+         * Sets the current status.
          *
-         * <p>Status can be {@link Timer#STATUS_UNKNOWN}, {@link Timer#STATUS_STARTED},
-         * {@link Timer#STATUS_PAUSED}, {@link Timer#STATUS_EXPIRED}, {@link Timer#STATUS_MISSED},
-         * or {@link Timer#STATUS_RESET}.
+         * <p>Status can be {@link #STATUS_UNKNOWN}, {@link #STATUS_STARTED},
+         * {@link #STATUS_PAUSED}, {@link #STATUS_EXPIRED}, {@link #STATUS_MISSED}, or
+         * {@link #STATUS_RESET}.
          */
         @NonNull
         public Builder setStatus(@Status int status) {
@@ -428,20 +506,19 @@
 
         /** Sets whether or not to activate the device vibrator when the {@link Timer} expires. */
         @NonNull
-        public Builder setVibrate(boolean vibrate) {
-            mVibrate = vibrate;
+        public Builder setShouldVibrate(boolean shouldVibrate) {
+            mShouldVibrate = shouldVibrate;
             return this;
         }
 
         /** Builds the {@link Timer}. */
         @NonNull
         public Timer build() {
-            Preconditions.checkNotNull(mId);
-            Preconditions.checkNotNull(mNamespace);
-
-            return new Timer(mNamespace, mId, mScore, mCreationTimestampMillis, mTtlMillis, mName,
-                    mDurationMillis, mStartTimeMillis, mStartTimeMillisInElapsedRealtime,
-                    mRemainingTimeMillis, mRingtone, mStatus, mVibrate);
+            return new Timer(mNamespace, mId, mDocumentScore,
+                    mCreationTimestampMillis, mDocumentTtlMillis, mName, mDurationMillis,
+                    mOriginalDurationMillis, mStartTimeMillis,
+                    mStartTimeMillisInElapsedRealtime, mBootCount,
+                    mRemainingTimeMillisSinceUpdate, mRingtone, mStatus, mShouldVibrate);
         }
     }
 }

diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java
new file mode 100644
index 0000000..c472161
--- /dev/null
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2022 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.utils;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Helper class used to validate date time formats.
+ *
+ * @hide
+ */
+@RestrictTo(LIBRARY)
+public final class DateTimeFormatValidator {
+    private DateTimeFormatValidator() {}
+
+    /**
+     * Returns true if the date string matches yyyy-MM-dd
+     */
+    public static boolean validateISO8601Date(@NonNull String dateString) {
+        return validateDateFormat("yyyy-MM-dd", dateString);
+    }
+
+    /**
+     * Returns true if the date string matches yyyy-MM-ddTHH:mm:ss
+     */
+    public static boolean validateISO8601DateTime(@NonNull String dateString) {
+        return validateDateFormat("yyyy-MM-dd'T'HH:mm:ss", dateString);
+    }
+
+    /**
+     * Returns true if the date string matches the provided format exactly.
+     */
+    public static boolean validateDateFormat(@NonNull String format, @NonNull String dateString) {
+        DateFormat dateFormat = new SimpleDateFormat(format);
+        dateFormat.setLenient(false);
+        try {
+            Date date = dateFormat.parse(dateString);
+            // ensure exact match
+            if (date == null || !dateString.equals(dateFormat.format(date))) {
+                return false;
+            }
+        } catch (ParseException e) {
+            return false;
+        }
+
+        return true;
+    }
+}

diff --git a/appsearch/appsearch-local-storage/build.gradle b/appsearch/appsearch-local-storage/build.gradle
index e79ca97..1e4fca1 100644
--- a/appsearch/appsearch-local-storage/build.gradle
+++ b/appsearch/appsearch-local-storage/build.gradle

@@ -55,7 +55,7 @@
     }
     externalNativeBuild {
         cmake {
-            version "3.22.1"
+            version libs.versions.cmake.get()
             path "../../../../external/icing/CMakeLists.txt"
         }
     }

diff --git a/benchmark/benchmark-common/api/1.1.0-beta03.txt b/benchmark/benchmark-common/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..8fd1366
--- /dev/null
+++ b/benchmark/benchmark-common/api/1.1.0-beta03.txt

@@ -0,0 +1,52 @@
+// Signature format: 4.0
+package androidx.benchmark {
+
+  @RequiresApi(21) public final class Api21Kt {
+  }
+
+  @RequiresApi(24) public final class Api24Kt {
+  }
+
+  @RequiresApi(27) public final class Api27Kt {
+  }
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  public final class ArgumentsKt {
+  }
+
+  public final class BenchmarkState {
+    method public boolean keepRunning();
+    method public void pauseTiming();
+    method public void resumeTiming();
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
+  }
+
+  public static final class BenchmarkState.Companion {
+  }
+
+  public final class ConfigurationErrorKt {
+  }
+
+  public final class MetricNameUtilsKt {
+  }
+
+  public final class ProfilerKt {
+  }
+
+  public final class UserspaceTracingKt {
+  }
+
+}
+
+package androidx.benchmark.perfetto {
+
+  public final class PerfettoConfigKt {
+  }
+
+  public final class UiStateKt {
+  }
+
+}
+

diff --git a/benchmark/benchmark-common/api/public_plus_experimental_1.1.0-beta03.txt b/benchmark/benchmark-common/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..fd9ccb2
--- /dev/null
+++ b/benchmark/benchmark-common/api/public_plus_experimental_1.1.0-beta03.txt

@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.benchmark {
+
+  @RequiresApi(21) public final class Api21Kt {
+  }
+
+  @RequiresApi(24) public final class Api24Kt {
+  }
+
+  @RequiresApi(27) public final class Api27Kt {
+  }
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  public final class ArgumentsKt {
+  }
+
+  public final class BenchmarkState {
+    method public boolean keepRunning();
+    method public void pauseTiming();
+    method @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public static void reportData(String className, String testName, @IntRange(from=0) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0) int warmupIterations, @IntRange(from=0) long thermalThrottleSleepSeconds, @IntRange(from=1) int repeatIterations);
+    method public void resumeTiming();
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
+  }
+
+  public static final class BenchmarkState.Companion {
+    method @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public void reportData(String className, String testName, @IntRange(from=0) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0) int warmupIterations, @IntRange(from=0) long thermalThrottleSleepSeconds, @IntRange(from=1) int repeatIterations);
+  }
+
+  @kotlin.Experimental @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public static @interface BenchmarkState.Companion.ExperimentalExternalReport {
+  }
+
+  public final class ConfigurationErrorKt {
+  }
+
+  public final class MetricNameUtilsKt {
+  }
+
+  public final class ProfilerKt {
+  }
+
+  public final class UserspaceTracingKt {
+  }
+
+}
+
+package androidx.benchmark.perfetto {
+
+  public final class PerfettoConfigKt {
+  }
+
+  public final class UiStateKt {
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/benchmark/benchmark-common/api/res-1.1.0-beta03.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to benchmark/benchmark-common/api/res-1.1.0-beta03.txt

diff --git a/benchmark/benchmark-common/api/restricted_1.1.0-beta03.txt b/benchmark/benchmark-common/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..fb74f25
--- /dev/null
+++ b/benchmark/benchmark-common/api/restricted_1.1.0-beta03.txt

@@ -0,0 +1,54 @@
+// Signature format: 4.0
+package androidx.benchmark {
+
+  @RequiresApi(21) public final class Api21Kt {
+  }
+
+  @RequiresApi(24) public final class Api24Kt {
+  }
+
+  @RequiresApi(27) public final class Api27Kt {
+  }
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  public final class ArgumentsKt {
+  }
+
+  public final class BenchmarkState {
+    method public boolean keepRunning();
+    method @kotlin.PublishedApi internal boolean keepRunningInternal();
+    method public void pauseTiming();
+    method public void resumeTiming();
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
+    field @kotlin.PublishedApi internal int iterationsRemaining;
+  }
+
+  public static final class BenchmarkState.Companion {
+  }
+
+  public final class ConfigurationErrorKt {
+  }
+
+  public final class MetricNameUtilsKt {
+  }
+
+  public final class ProfilerKt {
+  }
+
+  public final class UserspaceTracingKt {
+  }
+
+}
+
+package androidx.benchmark.perfetto {
+
+  public final class PerfettoConfigKt {
+  }
+
+  public final class UiStateKt {
+  }
+
+}
+

diff --git a/benchmark/benchmark-common/src/androidTest/java/androidx/benchmark/ProfilerTest.kt b/benchmark/benchmark-common/src/androidTest/java/androidx/benchmark/ProfilerTest.kt
index 5f5b7f4..dee870d 100644
--- a/benchmark/benchmark-common/src/androidTest/java/androidx/benchmark/ProfilerTest.kt
+++ b/benchmark/benchmark-common/src/androidTest/java/androidx/benchmark/ProfilerTest.kt

@@ -20,14 +20,12 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.filters.SdkSuppress
-import org.junit.Assume
+import java.io.File
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
 import org.junit.Assume.assumeFalse
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.File
-import kotlin.test.assertFalse
-import kotlin.test.assertSame
-import kotlin.test.assertTrue
 
 @MediumTest
 @RunWith(AndroidJUnit4::class)
@@ -52,18 +50,21 @@
 
     private fun verifyProfiler(
         profiler: Profiler,
-        file: File
+        regex: Regex
     ) {
-        Assume.assumeFalse(
+        assumeFalse(
             "Workaround native crash on API 21 in CI, see b/173662168",
             profiler == MethodTracing && Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP,
         )
 
-        file.delete() // clean up, if previous run left this behind
-        assertFalse(file.exists())
-
-        profiler.start("test")
+        val outputRelPath = profiler.start("test")!!.outputRelativePath
         profiler.stop()
+        val file = File(Outputs.outputDirectory, outputRelPath)
+
+        assertTrue(
+            actual = regex.matches(outputRelPath),
+            message = "expected profiler output path $outputRelPath to match $regex"
+        )
         assertTrue(file.exists(), "Profiler should create: ${file.absolutePath}")
 
         // we don't delete the file to enable inspecting the file
@@ -73,13 +74,13 @@
     @Test
     fun methodTracing() = verifyProfiler(
         profiler = MethodTracing,
-        file = Outputs.testOutputFile("test-methodTracing.trace")
+        regex = Regex("test-methodTracing-.+.trace")
     )
 
     @Test
     fun stackSamplingLegacy() = verifyProfiler(
         profiler = StackSamplingLegacy,
-        file = Outputs.testOutputFile("test-stackSamplingLegacy.trace")
+        regex = Regex("test-stackSamplingLegacy-.+.trace")
     )
 
     @SdkSuppress(minSdkVersion = 29) // simpleperf on system image starting API 29
@@ -90,7 +91,7 @@
 
         verifyProfiler(
             profiler = StackSamplingSimpleperf,
-            file = Outputs.testOutputFile("test-stackSampling.trace")
+            regex = Regex("test-stackSampling-.+.trace")
         )
     }
 }

diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Profiler.kt b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Profiler.kt
index d3d34f5..dbd8793 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Profiler.kt
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Profiler.kt

@@ -22,6 +22,7 @@
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.benchmark.BenchmarkState.Companion.TAG
+import androidx.benchmark.Outputs.dateToFileName
 import androidx.benchmark.simpleperf.ProfileSession
 import androidx.benchmark.simpleperf.RecordOptions
 
@@ -95,6 +96,10 @@
             "ConnectedSampled" to ConnectedSampling
         )
             .mapKeys { it.key.lowercase() }[name.lowercase()]
+
+        fun traceName(traceUniqueName: String, traceTypeLabel: String): String {
+            return "$traceUniqueName-$traceTypeLabel-${dateToFileName()}.trace"
+        }
     }
 }
 
@@ -127,13 +132,13 @@
 }
 
 internal object StackSamplingLegacy : Profiler() {
-    @RestrictTo(RestrictTo.Scope.TESTS)
+    @get:RestrictTo(RestrictTo.Scope.TESTS)
     var isRunning = false
 
     override fun start(traceUniqueName: String): ResultFile {
         isRunning = true
         return startRuntimeMethodTracing(
-            traceFileName = "$traceUniqueName-stackSamplingLegacy.trace",
+            traceFileName = traceName(traceUniqueName, "stackSamplingLegacy"),
             sampled = true
         )
     }
@@ -149,7 +154,7 @@
 internal object MethodTracing : Profiler() {
     override fun start(traceUniqueName: String): ResultFile {
         return startRuntimeMethodTracing(
-            traceFileName = "$traceUniqueName-methodTracing.trace",
+            traceFileName = traceName(traceUniqueName, "methodTracing"),
             sampled = false
         )
     }
@@ -219,7 +224,7 @@
         Shell.executeCommand("setprop debug.perf_cpu_time_max_percent 25")
         Shell.executeCommand("setprop debug.perf_event_mlock_kb 32800")
 
-        outputRelativePath = "$traceUniqueName-stackSampling.trace"
+        outputRelativePath = traceName(traceUniqueName, "stackSampling")
         session = ProfileSession().also {
             // prepare simpleperf must be done as shell user, so do this here with other shell setup
             // NOTE: this is sticky across reboots, so missing this will cause tests or profiling to

diff --git a/benchmark/benchmark-junit4/api/1.1.0-beta03.txt b/benchmark/benchmark-junit4/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..873f105
--- /dev/null
+++ b/benchmark/benchmark-junit4/api/1.1.0-beta03.txt

@@ -0,0 +1,23 @@
+// Signature format: 4.0
+package androidx.benchmark.junit4 {
+
+  public class AndroidBenchmarkRunner extends androidx.test.runner.AndroidJUnitRunner {
+    ctor public AndroidBenchmarkRunner();
+  }
+
+  public final class BenchmarkRule implements org.junit.rules.TestRule {
+    ctor public BenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public androidx.benchmark.BenchmarkState getState();
+  }
+
+  public final class BenchmarkRule.Scope {
+    method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class BenchmarkRuleKt {
+    method public static inline void measureRepeated(androidx.benchmark.junit4.BenchmarkRule, kotlin.jvm.functions.Function1<? super androidx.benchmark.junit4.BenchmarkRule.Scope,kotlin.Unit> block);
+  }
+
+}
+

diff --git a/benchmark/benchmark-junit4/api/public_plus_experimental_1.1.0-beta03.txt b/benchmark/benchmark-junit4/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..873f105
--- /dev/null
+++ b/benchmark/benchmark-junit4/api/public_plus_experimental_1.1.0-beta03.txt

@@ -0,0 +1,23 @@
+// Signature format: 4.0
+package androidx.benchmark.junit4 {
+
+  public class AndroidBenchmarkRunner extends androidx.test.runner.AndroidJUnitRunner {
+    ctor public AndroidBenchmarkRunner();
+  }
+
+  public final class BenchmarkRule implements org.junit.rules.TestRule {
+    ctor public BenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public androidx.benchmark.BenchmarkState getState();
+  }
+
+  public final class BenchmarkRule.Scope {
+    method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class BenchmarkRuleKt {
+    method public static inline void measureRepeated(androidx.benchmark.junit4.BenchmarkRule, kotlin.jvm.functions.Function1<? super androidx.benchmark.junit4.BenchmarkRule.Scope,kotlin.Unit> block);
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/benchmark/benchmark-junit4/api/res-1.1.0-beta03.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to benchmark/benchmark-junit4/api/res-1.1.0-beta03.txt

diff --git a/benchmark/benchmark-junit4/api/restricted_1.1.0-beta03.txt b/benchmark/benchmark-junit4/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..d3bf38c
--- /dev/null
+++ b/benchmark/benchmark-junit4/api/restricted_1.1.0-beta03.txt

@@ -0,0 +1,29 @@
+// Signature format: 4.0
+package androidx.benchmark.junit4 {
+
+  public class AndroidBenchmarkRunner extends androidx.test.runner.AndroidJUnitRunner {
+    ctor public AndroidBenchmarkRunner();
+  }
+
+  public final class BenchmarkRule implements org.junit.rules.TestRule {
+    ctor public BenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public androidx.benchmark.BenchmarkState getState();
+  }
+
+  public final class BenchmarkRule.Scope {
+    method @kotlin.PublishedApi internal androidx.benchmark.BenchmarkState getOuterState();
+    method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class BenchmarkRuleKt {
+    method public static inline void measureRepeated(androidx.benchmark.junit4.BenchmarkRule, kotlin.jvm.functions.Function1<? super androidx.benchmark.junit4.BenchmarkRule.Scope,kotlin.Unit> block);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class PerfettoRule implements org.junit.rules.TestRule {
+    ctor public PerfettoRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro-junit4/api/1.1.0-beta03.txt b/benchmark/benchmark-macro-junit4/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..4b1ab53
--- /dev/null
+++ b/benchmark/benchmark-macro-junit4/api/1.1.0-beta03.txt

@@ -0,0 +1,14 @@
+// Signature format: 4.0
+package androidx.benchmark.macro.junit4 {
+
+  public final class MacrobenchmarkRule implements org.junit.rules.TestRule {
+    ctor public MacrobenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, optional kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> setupBlock, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro-junit4/api/public_plus_experimental_1.1.0-beta03.txt b/benchmark/benchmark-macro-junit4/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..31d9966
--- /dev/null
+++ b/benchmark/benchmark-macro-junit4/api/public_plus_experimental_1.1.0-beta03.txt

@@ -0,0 +1,20 @@
+// Signature format: 4.0
+package androidx.benchmark.macro.junit4 {
+
+  @RequiresApi(28) @androidx.benchmark.macro.ExperimentalBaselineProfilesApi public final class BaselineProfileRule implements org.junit.rules.TestRule {
+    ctor public BaselineProfileRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public void collectBaselineProfile(String packageName, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
+  }
+
+  public final class MacrobenchmarkRule implements org.junit.rules.TestRule {
+    ctor public MacrobenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, optional kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> setupBlock, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro-junit4/api/public_plus_experimental_current.txt b/benchmark/benchmark-macro-junit4/api/public_plus_experimental_current.txt
index fa47278..31d9966 100644
--- a/benchmark/benchmark-macro-junit4/api/public_plus_experimental_current.txt
+++ b/benchmark/benchmark-macro-junit4/api/public_plus_experimental_current.txt

@@ -4,7 +4,6 @@
   @RequiresApi(28) @androidx.benchmark.macro.ExperimentalBaselineProfilesApi public final class BaselineProfileRule implements org.junit.rules.TestRule {
     ctor public BaselineProfileRule();
     method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
-    method public void collectBaselineProfile(String packageName, optional kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> setupBlock, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
     method public void collectBaselineProfile(String packageName, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
   }
 

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/benchmark/benchmark-macro-junit4/api/res-1.1.0-beta03.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to benchmark/benchmark-macro-junit4/api/res-1.1.0-beta03.txt

diff --git a/benchmark/benchmark-macro-junit4/api/restricted_1.1.0-beta03.txt b/benchmark/benchmark-macro-junit4/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..4b1ab53
--- /dev/null
+++ b/benchmark/benchmark-macro-junit4/api/restricted_1.1.0-beta03.txt

@@ -0,0 +1,14 @@
+// Signature format: 4.0
+package androidx.benchmark.macro.junit4 {
+
+  public final class MacrobenchmarkRule implements org.junit.rules.TestRule {
+    ctor public MacrobenchmarkRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, optional kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> setupBlock, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, optional androidx.benchmark.macro.StartupMode? startupMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, optional androidx.benchmark.macro.CompilationMode compilationMode, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+    method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/BaselineProfileRule.kt b/benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/BaselineProfileRule.kt
index f4b4bc1..d13868b 100644
--- a/benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/BaselineProfileRule.kt
+++ b/benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/BaselineProfileRule.kt

@@ -54,20 +54,15 @@
     /**
      * Collects baseline profiles for a critical user journey.
      * @param packageName Package name of the app for which profiles are to be generated.
-     * @param setupBlock The block performing app actions prior to the critical user journey.
-     * For example navigating to an Activity where scrolling will be measured.
      * @param [profileBlock] defines the critical user journey.
      */
-    @JvmOverloads
     public fun collectBaselineProfile(
         packageName: String,
-        setupBlock: MacrobenchmarkScope.() -> Unit = {},
         profileBlock: MacrobenchmarkScope.() -> Unit
     ) {
         collectBaselineProfile(
             currentDescription.toUniqueName(),
             packageName = packageName,
-            setupBlock = setupBlock,
             profileBlock = profileBlock
         )
     }

diff --git a/benchmark/benchmark-macro/api/1.1.0-beta03.txt b/benchmark/benchmark-macro/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..ad0beca
--- /dev/null
+++ b/benchmark/benchmark-macro/api/1.1.0-beta03.txt

@@ -0,0 +1,105 @@
+// Signature format: 4.0
+package androidx.benchmark.macro {
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  public enum BaselineProfileMode {
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Disable;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Require;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode UseIfAvailable;
+  }
+
+  public final class BaselineProfilesKt {
+  }
+
+  public abstract sealed class CompilationMode {
+    field public static final androidx.benchmark.macro.CompilationMode.Companion Companion;
+    field public static final androidx.benchmark.macro.CompilationMode DEFAULT;
+  }
+
+  public static final class CompilationMode.Companion {
+  }
+
+  public static final class CompilationMode.Full extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Full();
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.None extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.None();
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.Partial extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode, optional @IntRange(from=0) int warmupIterations);
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode);
+    ctor public CompilationMode.Partial();
+    method public androidx.benchmark.macro.BaselineProfileMode getBaselineProfileMode();
+    method public int getWarmupIterations();
+    property public final androidx.benchmark.macro.BaselineProfileMode baselineProfileMode;
+    property public final int warmupIterations;
+  }
+
+  public final class CompilationModeKt {
+  }
+
+  public final class FrameTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public FrameTimingMetric();
+  }
+
+  public final class IdeSummaryStringKt {
+  }
+
+  public final class IterationResultKt {
+  }
+
+  public final class MacrobenchmarkKt {
+  }
+
+  public final class MacrobenchmarkScope {
+    ctor public MacrobenchmarkScope(String packageName, boolean launchWithClearTask);
+    method public void dropKernelPageCache();
+    method public androidx.test.uiautomator.UiDevice getDevice();
+    method public Integer? getIteration();
+    method public String getPackageName();
+    method public void killProcess();
+    method public void pressHome(optional long delayDurationMs);
+    method public void pressHome();
+    method public void startActivityAndWait(optional kotlin.jvm.functions.Function1<? super android.content.Intent,kotlin.Unit> block);
+    method public void startActivityAndWait();
+    method public void startActivityAndWait(android.content.Intent intent);
+    property public final androidx.test.uiautomator.UiDevice device;
+    property public final Integer? iteration;
+    property public final String packageName;
+  }
+
+  public abstract sealed class Metric {
+  }
+
+  public final class MetricKt {
+  }
+
+  public final class MetricResultExtensionsKt {
+  }
+
+  public enum StartupMode {
+    enum_constant public static final androidx.benchmark.macro.StartupMode COLD;
+    enum_constant public static final androidx.benchmark.macro.StartupMode HOT;
+    enum_constant public static final androidx.benchmark.macro.StartupMode WARM;
+  }
+
+  public final class StartupTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public StartupTimingMetric();
+  }
+
+  public final class TagKt {
+  }
+
+}
+
+package androidx.benchmark.macro.perfetto {
+
+  public final class ForceTracingKt {
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro/api/public_plus_experimental_1.1.0-beta03.txt b/benchmark/benchmark-macro/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..f010200
--- /dev/null
+++ b/benchmark/benchmark-macro/api/public_plus_experimental_1.1.0-beta03.txt

@@ -0,0 +1,115 @@
+// Signature format: 4.0
+package androidx.benchmark.macro {
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  public enum BaselineProfileMode {
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Disable;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Require;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode UseIfAvailable;
+  }
+
+  public final class BaselineProfilesKt {
+  }
+
+  public abstract sealed class CompilationMode {
+    field public static final androidx.benchmark.macro.CompilationMode.Companion Companion;
+    field public static final androidx.benchmark.macro.CompilationMode DEFAULT;
+  }
+
+  public static final class CompilationMode.Companion {
+  }
+
+  public static final class CompilationMode.Full extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Full();
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.None extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.None();
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.Partial extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode, optional @IntRange(from=0) int warmupIterations);
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode);
+    ctor public CompilationMode.Partial();
+    method public androidx.benchmark.macro.BaselineProfileMode getBaselineProfileMode();
+    method public int getWarmupIterations();
+    property public final androidx.benchmark.macro.BaselineProfileMode baselineProfileMode;
+    property public final int warmupIterations;
+  }
+
+  public final class CompilationModeKt {
+  }
+
+  @kotlin.RequiresOptIn(message="The Baseline profile generation API is experimental.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalBaselineProfilesApi {
+  }
+
+  @kotlin.RequiresOptIn(message="This Metric API is experimental.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalMetricApi {
+  }
+
+  public final class FrameTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public FrameTimingMetric();
+  }
+
+  public final class IdeSummaryStringKt {
+  }
+
+  public final class IterationResultKt {
+  }
+
+  public final class MacrobenchmarkKt {
+  }
+
+  public final class MacrobenchmarkScope {
+    ctor public MacrobenchmarkScope(String packageName, boolean launchWithClearTask);
+    method public void dropKernelPageCache();
+    method public androidx.test.uiautomator.UiDevice getDevice();
+    method public Integer? getIteration();
+    method public String getPackageName();
+    method public void killProcess();
+    method public void pressHome(optional long delayDurationMs);
+    method public void pressHome();
+    method public void startActivityAndWait(optional kotlin.jvm.functions.Function1<? super android.content.Intent,kotlin.Unit> block);
+    method public void startActivityAndWait();
+    method public void startActivityAndWait(android.content.Intent intent);
+    property public final androidx.test.uiautomator.UiDevice device;
+    property public final Integer? iteration;
+    property public final String packageName;
+  }
+
+  public abstract sealed class Metric {
+  }
+
+  public final class MetricKt {
+  }
+
+  public final class MetricResultExtensionsKt {
+  }
+
+  public enum StartupMode {
+    enum_constant public static final androidx.benchmark.macro.StartupMode COLD;
+    enum_constant public static final androidx.benchmark.macro.StartupMode HOT;
+    enum_constant public static final androidx.benchmark.macro.StartupMode WARM;
+  }
+
+  public final class StartupTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public StartupTimingMetric();
+  }
+
+  public final class TagKt {
+  }
+
+  @RequiresApi(29) @androidx.benchmark.macro.ExperimentalMetricApi public final class TraceSectionMetric extends androidx.benchmark.macro.Metric {
+    ctor public TraceSectionMetric(String sectionName);
+  }
+
+}
+
+package androidx.benchmark.macro.perfetto {
+
+  public final class ForceTracingKt {
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/benchmark/benchmark-macro/api/res-1.1.0-beta03.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to benchmark/benchmark-macro/api/res-1.1.0-beta03.txt

diff --git a/benchmark/benchmark-macro/api/restricted_1.1.0-beta03.txt b/benchmark/benchmark-macro/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..fd5bba3
--- /dev/null
+++ b/benchmark/benchmark-macro/api/restricted_1.1.0-beta03.txt

@@ -0,0 +1,122 @@
+// Signature format: 4.0
+package androidx.benchmark.macro {
+
+  @RequiresApi(29) public final class Api29Kt {
+  }
+
+  @RequiresApi(23) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class AudioUnderrunMetric extends androidx.benchmark.macro.Metric {
+    ctor public AudioUnderrunMetric();
+  }
+
+  public enum BaselineProfileMode {
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Disable;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode Require;
+    enum_constant public static final androidx.benchmark.macro.BaselineProfileMode UseIfAvailable;
+  }
+
+  public final class BaselineProfilesKt {
+    method @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static void collectBaselineProfile(String uniqueName, String packageName, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
+  }
+
+  public abstract sealed class CompilationMode {
+    field public static final androidx.benchmark.macro.CompilationMode.Companion Companion;
+    field public static final androidx.benchmark.macro.CompilationMode DEFAULT;
+  }
+
+  public static final class CompilationMode.Companion {
+  }
+
+  public static final class CompilationMode.Full extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Full();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final class CompilationMode.Interpreted extends androidx.benchmark.macro.CompilationMode {
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.None extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.None();
+  }
+
+  @RequiresApi(24) public static final class CompilationMode.Partial extends androidx.benchmark.macro.CompilationMode {
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode, optional @IntRange(from=0) int warmupIterations);
+    ctor public CompilationMode.Partial(optional androidx.benchmark.macro.BaselineProfileMode baselineProfileMode);
+    ctor public CompilationMode.Partial();
+    method public androidx.benchmark.macro.BaselineProfileMode getBaselineProfileMode();
+    method public int getWarmupIterations();
+    property public final androidx.benchmark.macro.BaselineProfileMode baselineProfileMode;
+    property public final int warmupIterations;
+  }
+
+  public final class CompilationModeKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static boolean isSupportedWithVmSettings(androidx.benchmark.macro.CompilationMode);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class FrameTimingGfxInfoMetric extends androidx.benchmark.macro.Metric {
+    ctor public FrameTimingGfxInfoMetric();
+  }
+
+  public final class FrameTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public FrameTimingMetric();
+  }
+
+  public final class IdeSummaryStringKt {
+  }
+
+  public final class IterationResultKt {
+  }
+
+  public final class MacrobenchmarkKt {
+  }
+
+  public final class MacrobenchmarkScope {
+    ctor public MacrobenchmarkScope(String packageName, boolean launchWithClearTask);
+    method public void dropKernelPageCache();
+    method public androidx.test.uiautomator.UiDevice getDevice();
+    method public Integer? getIteration();
+    method public String getPackageName();
+    method public void killProcess();
+    method public void pressHome(optional long delayDurationMs);
+    method public void pressHome();
+    method public void startActivityAndWait(optional kotlin.jvm.functions.Function1<? super android.content.Intent,kotlin.Unit> block);
+    method public void startActivityAndWait();
+    method public void startActivityAndWait(android.content.Intent intent);
+    property public final androidx.test.uiautomator.UiDevice device;
+    property public final Integer? iteration;
+    property public final String packageName;
+  }
+
+  public abstract sealed class Metric {
+  }
+
+  public final class MetricKt {
+  }
+
+  public final class MetricResultExtensionsKt {
+  }
+
+  public enum StartupMode {
+    enum_constant public static final androidx.benchmark.macro.StartupMode COLD;
+    enum_constant public static final androidx.benchmark.macro.StartupMode HOT;
+    enum_constant public static final androidx.benchmark.macro.StartupMode WARM;
+  }
+
+  @RequiresApi(29) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class StartupTimingLegacyMetric extends androidx.benchmark.macro.Metric {
+    ctor public StartupTimingLegacyMetric();
+  }
+
+  public final class StartupTimingMetric extends androidx.benchmark.macro.Metric {
+    ctor public StartupTimingMetric();
+  }
+
+  public final class TagKt {
+  }
+
+}
+
+package androidx.benchmark.macro.perfetto {
+
+  public final class ForceTracingKt {
+  }
+
+}
+

diff --git a/benchmark/benchmark-macro/api/restricted_current.ignore b/benchmark/benchmark-macro/api/restricted_current.ignore
new file mode 100644
index 0000000..01c1abb
--- /dev/null
+++ b/benchmark/benchmark-macro/api/restricted_current.ignore

@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.benchmark.macro.BaselineProfilesKt#collectBaselineProfile(String, String, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>):
+    Removed method androidx.benchmark.macro.BaselineProfilesKt.collectBaselineProfile(String,String,kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>,kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit>)

diff --git a/benchmark/benchmark-macro/api/restricted_current.txt b/benchmark/benchmark-macro/api/restricted_current.txt
index d90e8af..fd5bba3 100644
--- a/benchmark/benchmark-macro/api/restricted_current.txt
+++ b/benchmark/benchmark-macro/api/restricted_current.txt

@@ -15,7 +15,7 @@
   }
 
   public final class BaselineProfilesKt {
-    method @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static void collectBaselineProfile(String uniqueName, String packageName, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> setupBlock, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
+    method @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static void collectBaselineProfile(String uniqueName, String packageName, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> profileBlock);
   }
 
   public abstract sealed class CompilationMode {

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt
index 1e89bc5..8f9aea9 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt

@@ -35,7 +35,6 @@
 fun collectBaselineProfile(
     uniqueName: String,
     packageName: String,
-    setupBlock: MacrobenchmarkScope.() -> Unit,
     profileBlock: MacrobenchmarkScope.() -> Unit
 ) {
     require(Build.VERSION.SDK_INT >= 28) {
@@ -63,7 +62,6 @@
             compilationMode.resetAndCompile(
                 packageName = packageName
             ) {
-                setupBlock(scope)
                 profileBlock(scope)
             }
         }

diff --git a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/GithubBrowserBaselineProfile.kt b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/GithubBrowserBaselineProfile.kt
index ad70b84..4983e76 100644
--- a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/GithubBrowserBaselineProfile.kt
+++ b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/GithubBrowserBaselineProfile.kt

@@ -63,10 +63,8 @@
     fun githubBrowserProfiles() {
         baselineRule.collectBaselineProfile(
             packageName = PACKAGE_NAME,
-            setupBlock = {
-                startActivityAndWait()
-            },
             profileBlock = {
+                startActivityAndWait()
                 val searchText = device.findObject(By.res(PACKAGE_NAME, REPO_SEARCH_ID))
                 searchText?.text = "Test"
                 val search = device.findObject(By.res(PACKAGE_NAME, SEARCH_ID))

diff --git a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialListScrollBaselineProfile.kt b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialListScrollBaselineProfile.kt
index b85d69c..3218a28 100644
--- a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialListScrollBaselineProfile.kt
+++ b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialListScrollBaselineProfile.kt

@@ -48,12 +48,10 @@
     fun baselineProfiles() {
         baselineRule.collectBaselineProfile(
             packageName = "androidx.benchmark.integration.macrobenchmark.target",
-            setupBlock = {
+            profileBlock = {
                 val intent = Intent()
                 intent.action = ACTION
                 startActivityAndWait(intent)
-            },
-            profileBlock = {
                 val recycler = device.findObject(
                     By.res(
                         PACKAGE_NAME,

diff --git a/buildSrc-tests/src/test/kotlin/androidx/build/dependencyTracker/ChangeInfoGitClientTest.kt b/buildSrc-tests/src/test/kotlin/androidx/build/dependencyTracker/ChangeInfoGitClientTest.kt
index ebeb86a..501c7c6 100644
--- a/buildSrc-tests/src/test/kotlin/androidx/build/dependencyTracker/ChangeInfoGitClientTest.kt
+++ b/buildSrc-tests/src/test/kotlin/androidx/build/dependencyTracker/ChangeInfoGitClientTest.kt

@@ -271,6 +271,6 @@
     fun getVersion(config: String): String? {
         return ChangeInfoGitClient("{}", config)
             .getGitLog(GitCommitRange(n = 1), keepMerges = true, fullProjectDir = File("."))
-            .getOrNull(0)?.gitCommit
+            .getOrNull(0)?.sha
     }
 }

diff --git a/buildSrc/lint.xml b/buildSrc/lint.xml
index 5ec6632..08fefd5 100644
--- a/buildSrc/lint.xml
+++ b/buildSrc/lint.xml

@@ -32,6 +32,19 @@
         <!-- Required for AppSearch icing tests. -->
         <ignore path="**/java/tests/**" />
     </issue>
+
+    <issue id="IllegalExperimentalApiUsage">
+
+        <!--
+         The placeholder string "USE_SYSTEM_OUT_DIR" must match the string
+         ATOMIC_LIBRARY_GROUP_FILE_PLACEHOLDER defined in BanInappropriateExperimentalUsage.
+         The suffix must match `fileLocation` defined in AndroidXRootImplPlugin.
+        -->
+        <option
+            name="atomicLibraryGroupFilename"
+            value="USE_SYSTEM_OUT_DIR/lint/atomic-library-groups.txt"/>
+    </issue>
+
     <!-- Re-enable high-priority checks for tests (and everything else). -->
     <issue id="NewApi" severity="fatal" />
     <issue id="WrongThread" severity="fatal" />

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index dc04d9a..132359e1 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt

@@ -113,7 +113,6 @@
 
         project.configureTaskTimeouts()
         project.configureMavenArtifactUpload(extension)
-        project.configureExportAtomicLibraryGroupsToText()
         project.configureExternalDependencyLicenseCheck()
         project.configureProjectStructureValidation(extension)
         project.configureProjectVersionValidation(extension)
@@ -394,17 +393,6 @@
         project.addToProjectMap(extension)
     }
 
-    private fun Project.configureExportAtomicLibraryGroupsToText() {
-        project.tasks.register(
-            "exportAtomicLibraryGroupsToText",
-            ExportAtomicLibraryGroupsToTextTask::class.java
-        ) { task ->
-            task.libraryGroupFile = project.file("${project.getSupportRootFolder()}" +
-                "/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt")
-            task.textOutputFile = project.file("${project.buildDir}/lint/atomic-library-groups.txt")
-        }
-    }
-
     private fun Project.configureProjectStructureValidation(
         extension: AndroidXExtension
     ) {

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
index 07922a9..00a1892 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt

@@ -92,6 +92,20 @@
             tasks.register(AndroidXImplPlugin.CREATE_LIBRARY_BUILD_INFO_FILES_TASK)
         )
 
+        buildOnServerTask.dependsOn(
+            tasks.register(
+                "exportAtomicLibraryGroupsToTextRoot",
+                ExportAtomicLibraryGroupsToTextTask::class.java
+            ) { task ->
+                task.libraryGroupFile = project.file("${project.getSupportRootFolder()}" +
+                    "/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt")
+
+                // This suffix must match the suffix in buildSrc/lint.xml
+                val fileLocation = "${getRootOutDirectory()}/lint/atomic-library-groups.txt"
+                task.textOutputFile = project.file(fileLocation)
+            }
+        )
+
         VerifyPlaygroundGradleConfigurationTask.createIfNecessary(project)?.let {
             buildOnServerTask.dependsOn(it)
         }

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
index 6345639..53d7c42 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt

@@ -72,7 +72,6 @@
     // Create fake variant tasks since that is what is invoked by developers.
     val lintTask = tasks.named("lint")
     lintTask.configure { task ->
-        task.dependsOn(tasks.named("exportAtomicLibraryGroupsToText"))
         AffectedModuleDetector.configureTaskGuard(task)
     }
     afterEvaluate {
@@ -123,7 +122,6 @@
                 }}"
             ).configure { task ->
                 AffectedModuleDetector.configureTaskGuard(task)
-                task.dependsOn(tasks.named("exportAtomicLibraryGroupsToText"))
             }
             tasks.named(
                 "lintAnalyze${variant.name.replaceFirstChar {
@@ -131,7 +129,6 @@
                 }}"
             ).configure { task ->
                 AffectedModuleDetector.configureTaskGuard(task)
-                task.dependsOn(tasks.named("exportAtomicLibraryGroupsToText"))
             }
             /* TODO: uncomment when we upgrade to AGP 7.1.0-alpha04
             tasks.named("lintReport${variant.name.capitalize(Locale.US)}").configure { task ->

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/ChangeInfoGitClient.kt b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/ChangeInfoGitClient.kt
index e6758cc..ab175b1 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/ChangeInfoGitClient.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/ChangeInfoGitClient.kt

@@ -147,7 +147,7 @@
         }
         var latestCommit: String? = parseSupportVersion(versionInfo)
         if (latestCommit != null) {
-            return listOf(Commit(latestCommit, fullProjectDir.toString()))
+            return listOf(Commit("_CommitSHA:$latestCommit", fullProjectDir.toString()))
         }
         return listOf()
     }

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitClient.kt b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitClient.kt
index 073659a..dcc7b31 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitClient.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitClient.kt

@@ -121,7 +121,7 @@
 /**
  * Class implementation of a git commit.  It uses the input delimiters to parse the commit
  *
- * @property gitCommit a string representation of a git commit
+ * @property formattedCommitText a string representation of a git commit
  * @property projectDir the project directory for which to parse file paths from a commit
  * @property commitSHADelimiter the term to use to search for the commit SHA
  * @property subjectDelimiter the term to use to search for the subject (aka commit summary)
@@ -130,7 +130,7 @@
  * @property authorEmailDelimiter the term to use to search for the author email
  */
 data class Commit(
-    val gitCommit: String,
+    val formattedCommitText: String,
     val projectDir: String,
     private val commitSHADelimiter: String = "_CommitSHA:",
     private val subjectDelimiter: String = "_Subject:",
@@ -150,7 +150,7 @@
     )
 
     init {
-        val listedCommit: List<String> = gitCommit.split('\n')
+        val listedCommit: List<String> = formattedCommitText.split('\n')
         listedCommit.filter { line -> line.trim() != "" }.forEach { line ->
             processCommitLine(line)
         }
@@ -184,7 +184,7 @@
         }
         releaseNoteDelimiters.forEach { delimiter ->
             if (delimiter in line) {
-                getReleaseNotesFromGitLine(line, gitCommit)
+                getReleaseNotesFromGitLine(line, formattedCommitText)
                 return
             }
         }
@@ -270,7 +270,7 @@
      *                  the commit cannot be explained in one line"
      * `release notes: "This is a one-line release note.  The quotes can be used this way too"`
      */
-    private fun getReleaseNotesFromGitLine(line: String, gitCommit: String) {
+    private fun getReleaseNotesFromGitLine(line: String, formattedCommitText: String) {
         /* Account for the use of quotes in a release note line
          * No quotes in the Release Note line means it's a one-line release note
          * If there are quotes, assume it's a multi-line release note
@@ -285,21 +285,22 @@
             releaseNoteDelimiters.forEach { delimiter ->
                 if (delimiter in line) {
                     // Find the starting quote of the release notes quote block
-                    var releaseNoteStartIndex = gitCommit.lastIndexOf(delimiter) + delimiter.length
-                    releaseNoteStartIndex = gitCommit.indexOf('"', releaseNoteStartIndex)
+                    var releaseNoteStartIndex = formattedCommitText.lastIndexOf(delimiter)
+                    + delimiter.length
+                    releaseNoteStartIndex = formattedCommitText.indexOf('"', releaseNoteStartIndex)
                     // Move to the character after the first quote
-                    if (gitCommit[releaseNoteStartIndex] == '"') {
+                    if (formattedCommitText[releaseNoteStartIndex] == '"') {
                         releaseNoteStartIndex++
                     }
                     // Find the ending quote of the release notes quote block
                     var releaseNoteEndIndex = releaseNoteStartIndex + 1
-                    releaseNoteEndIndex = gitCommit.indexOf('"', releaseNoteEndIndex)
+                    releaseNoteEndIndex = formattedCommitText.indexOf('"', releaseNoteEndIndex)
                     // If there is no closing quote, just use the first line
                     if (releaseNoteEndIndex < 0) {
                         getOneLineReleaseNotesFromGitLine(line)
                         return
                     }
-                    releaseNote = gitCommit.substring(
+                    releaseNote = formattedCommitText.substring(
                         startIndex = releaseNoteStartIndex,
                         endIndex = releaseNoteEndIndex
                     ).trim()

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitRunnerGitClient.kt b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitRunnerGitClient.kt
index 985e375..2be38e2 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitRunnerGitClient.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/gitclient/GitRunnerGitClient.kt

@@ -209,7 +209,7 @@
 
     companion object {
         const val PREVIOUS_SUBMITTED_CMD =
-            "git log -1 --merges --oneline --invert-grep --author=android-build-server"
+            "git log -1 --merges --oneline"
         const val CHANGED_FILES_CMD_PREFIX = "git diff --name-only"
         const val GIT_LOG_CMD_PREFIX = "git log --name-only"
     }

diff --git a/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
index 9e8d0b4..ec22373 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt

@@ -54,6 +54,7 @@
     val ENTERPRISE = LibraryGroup("androidx.enterprise", LibraryVersions.ENTERPRISE)
     val EXIFINTERFACE = LibraryGroup("androidx.exifinterface", LibraryVersions.EXIFINTERFACE)
     val FRAGMENT = LibraryGroup("androidx.fragment", LibraryVersions.FRAGMENT)
+    val GLANCE_TEMPLATE = LibraryGroup("androidx.template", LibraryVersions.GLANCE_TEMPLATE)
     val GLANCE = LibraryGroup("androidx.glance", LibraryVersions.GLANCE)
     val GRIDLAYOUT = LibraryGroup("androidx.gridlayout", LibraryVersions.GRIDLAYOUT)
     val HEALTH = LibraryGroup("androidx.health", null)
@@ -68,7 +69,6 @@
     val LIBYUV = LibraryGroup("libyuv", LibraryVersions.LIBYUV)
     val LIFECYCLE = LibraryGroup("androidx.lifecycle", LibraryVersions.LIFECYCLE)
     val LOADER = LibraryGroup("androidx.loader", LibraryVersions.LOADER)
-    val LOCALBROADCASTMANAGER = LibraryGroup("androidx.localbroadcastmanager", LibraryVersions.LOCALBROADCASTMANAGER)
     val MEDIA = LibraryGroup("androidx.media", null)
     val MEDIA2 = LibraryGroup("androidx.media2", LibraryVersions.MEDIA2)
     val MEDIAROUTER = LibraryGroup("androidx.mediarouter", LibraryVersions.MEDIAROUTER)

diff --git a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
index b0eb459..a2bd6d7 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt

@@ -20,7 +20,7 @@
  * The list of versions codes of all the libraries in this project.
  */
 object LibraryVersions {
-    val ACTIVITY = Version("1.5.0-alpha01")
+    val ACTIVITY = Version("1.5.0-alpha02")
     val ADS_IDENTIFIER = Version("1.0.0-alpha05")
     val ANNOTATION = Version("1.4.0-alpha02")
     val ANNOTATION_EXPERIMENTAL = Version("1.3.0-alpha01")
@@ -29,44 +29,45 @@
     val ARCH_CORE = Version("2.2.0-alpha01")
     val ASYNCLAYOUTINFLATER = Version("1.1.0-alpha01")
     val AUTOFILL = Version("1.2.0-beta02")
-    val BENCHMARK = Version("1.1.0-beta02")
+    val BENCHMARK = Version("1.1.0-beta03")
     val BIOMETRIC = Version("1.2.0-alpha05")
     val BROWSER = Version("1.5.0-alpha01")
     val BUILDSRC_TESTS = Version("1.0.0-alpha01")
-    val CAMERA = Version("1.1.0-beta01")
+    val CAMERA = Version("1.1.0-beta02")
     val CAMERA_PIPE = Version("1.0.0-alpha01")
     val CARDVIEW = Version("1.1.0-alpha01")
-    val CAR_APP = Version("1.2.0-beta02")
+    val CAR_APP = Version("1.2.0-beta03")
     val COLLECTION = Version("1.3.0-alpha01")
     val COLLECTION2 = Version("1.3.0-alpha01")
     val CONTENTPAGER = Version("1.1.0-alpha01")
-    val COMPOSE_MATERIAL3 = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.0.0-alpha04")
-    val COMPOSE = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.2.0-alpha02")
+    val COMPOSE_MATERIAL3 = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.0.0-alpha05")
+    val COMPOSE = Version(System.getenv("COMPOSE_CUSTOM_VERSION") ?: "1.2.0-alpha03")
     val COORDINATORLAYOUT = Version("1.3.0-alpha01")
-    val CORE = Version("1.8.0-alpha03")
+    val CORE = Version("1.8.0-alpha04")
     val CORE_ANIMATION = Version("1.0.0-alpha03")
     val CORE_ANIMATION_TESTING = Version("1.0.0-alpha03")
     val CORE_APPDIGEST = Version("1.0.0-alpha01")
     val CORE_GOOGLE_SHORTCUTS = Version("1.1.0-alpha02")
     val CORE_PERFORMANCE = Version("1.0.0-alpha02")
-    val CORE_REMOTEVIEWS = Version("1.0.0-alpha02")
+    val CORE_REMOTEVIEWS = Version("1.0.0-alpha03")
     val CORE_ROLE = Version("1.2.0-alpha01")
     val CORE_SPLASHSCREEN = Version("1.0.0-beta01")
     val CURSORADAPTER = Version("1.1.0-alpha01")
     val CUSTOMVIEW = Version("1.2.0-alpha01")
     val DATASTORE = Version("1.1.0-alpha01")
     val DOCUMENTFILE = Version("1.1.0-alpha02")
-    val DRAGANDDROP = Version("1.0.0-alpha03")
+    val DRAGANDDROP = Version("1.0.0-alpha04")
     val DRAWERLAYOUT = Version("1.2.0-alpha01")
     val DYNAMICANIMATION = Version("1.1.0-alpha04")
     val DYNAMICANIMATION_KTX = Version("1.0.0-alpha04")
     val EMOJI = Version("1.2.0-alpha03")
-    val EMOJI2 = Version("1.1.0-beta01")
+    val EMOJI2 = Version("1.1.0-beta02")
     val ENTERPRISE = Version("1.1.0-rc01")
     val EXIFINTERFACE = Version("1.4.0-alpha01")
-    val FRAGMENT = Version("1.5.0-alpha01")
+    val FRAGMENT = Version("1.5.0-alpha02")
     val FUTURES = Version("1.2.0-alpha01")
-    val GLANCE = Version("1.0.0-alpha02")
+    val GLANCE_TEMPLATE = Version("1.0.0-alpha01")
+    val GLANCE = Version("1.0.0-alpha03")
     val GRIDLAYOUT = Version("1.1.0-alpha01")
     val HEALTH_SERVICES_CLIENT = Version("1.0.0-alpha04")
     val HEIFWRITER = Version("1.1.0-alpha02")
@@ -81,31 +82,30 @@
     val LEANBACK_TAB = Version("1.1.0-beta01")
     val LEANBACK_GRID = Version("1.0.0-alpha02")
     val LEGACY = Version("1.1.0-alpha01")
-    val LOCALBROADCASTMANAGER = Version("1.2.0-alpha01")
     val LIBYUV = Version("0.1.0-dev01")
-    val LIFECYCLE = Version("2.5.0-alpha01")
-    val LIFECYCLE_VIEWMODEL_COMPOSE = Version("2.5.0-alpha01")
+    val LIFECYCLE = Version("2.5.0-alpha02")
+    val LIFECYCLE_VIEWMODEL_COMPOSE = Version("2.5.0-alpha02")
     val LIFECYCLE_EXTENSIONS = Version("2.2.0")
     val LOADER = Version("1.2.0-alpha01")
-    val MEDIA = Version("1.5.0-rc01")
+    val MEDIA = Version("1.6.0-alpha01")
     val MEDIA2 = Version("1.3.0-alpha01")
     val MEDIAROUTER = Version("1.3.0-alpha02")
     val METRICS = Version("1.0.0-alpha01")
-    val NAVIGATION = Version("2.5.0-alpha01")
+    val NAVIGATION = Version("2.5.0-alpha02")
     val PAGING = Version("3.2.0-alpha01")
     val PAGING_COMPOSE = Version("1.0.0-alpha15")
     val PALETTE = Version("1.1.0-alpha01")
     val PRINT = Version("1.1.0-beta01")
     val PERCENTLAYOUT = Version("1.1.0-alpha01")
     val PREFERENCE = Version("1.3.0-alpha01")
-    val PROFILEINSTALLER = Version("1.2.0-alpha02")
+    val PROFILEINSTALLER = Version("1.2.0-alpha03")
     val RECOMMENDATION = Version("1.1.0-alpha01")
     val RECYCLERVIEW = Version("1.3.0-alpha02")
     val RECYCLERVIEW_SELECTION = Version("1.2.0-alpha02")
     val REMOTECALLBACK = Version("1.0.0-alpha02")
     val RESOURCEINSPECTION = Version("1.1.0-alpha01")
     val ROOM = Version("2.5.0-alpha01")
-    val SAVEDSTATE = Version("1.2.0-alpha01")
+    val SAVEDSTATE = Version("1.2.0-alpha02")
     val SECURITY = Version("1.1.0-alpha04")
     val SECURITY_APP_AUTHENTICATOR = Version("1.0.0-alpha03")
     val SECURITY_APP_AUTHENTICATOR_TESTING = Version("1.0.0-alpha02")
@@ -136,13 +136,13 @@
     val VIEWPAGER = Version("1.1.0-alpha02")
     val VIEWPAGER2 = Version("1.1.0-beta02")
     val WEAR = Version("1.3.0-alpha02")
-    val WEAR_COMPOSE = Version("1.0.0-alpha15")
+    val WEAR_COMPOSE = Version("1.0.0-alpha16")
     val WEAR_INPUT = Version("1.2.0-alpha03")
     val WEAR_INPUT_TESTING = WEAR_INPUT
     val WEAR_ONGOING = Version("1.1.0-alpha01")
     val WEAR_PHONE_INTERACTIONS = Version("1.1.0-alpha03")
     val WEAR_REMOTE_INTERACTIONS = Version("1.1.0-alpha01")
-    val WEAR_TILES = Version("1.1.0-alpha01")
+    val WEAR_TILES = Version("1.1.0-alpha02")
     val WEAR_WATCHFACE = Version("1.1.0-alpha03")
     val WEBKIT = Version("1.5.0-alpha01")
     val WINDOW = Version("1.1.0-alpha01")

diff --git a/busytown/impl/build-studio-and-androidx.sh b/busytown/impl/build-studio-and-androidx.sh
index 0115f27..3354aa1 100755
--- a/busytown/impl/build-studio-and-androidx.sh
+++ b/busytown/impl/build-studio-and-androidx.sh

@@ -85,7 +85,8 @@
 function buildAndroidx() {
   LOG_PROCESSOR="$SCRIPTS_DIR/../development/build_log_processor.sh"
   properties="-Pandroidx.summarizeStderr --no-daemon"
-  "$LOG_PROCESSOR"                   $gw $properties -p frameworks/support    $androidxArguments --profile
+  "$LOG_PROCESSOR" $gw $properties -p frameworks/support $androidxArguments --profile \
+    --dependency-verification=off # building against tip of tree of AGP that potentially pulls in new dependencies
   $SCRIPTS_DIR/impl/parse_profile_htmls.sh
 }
 

diff --git a/camera/camera-camera2/api/1.1.0-beta02.txt b/camera/camera-camera2/api/1.1.0-beta02.txt
new file mode 100644
index 0000000..1459b2c
--- /dev/null
+++ b/camera/camera-camera2/api/1.1.0-beta02.txt

@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.camera.camera2 {
+
+  @RequiresApi(21) public final class Camera2Config {
+    method public static androidx.camera.core.CameraXConfig defaultConfig();
+  }
+
+}
+

diff --git a/camera/camera-camera2/api/public_plus_experimental_1.1.0-beta02.txt b/camera/camera-camera2/api/public_plus_experimental_1.1.0-beta02.txt
new file mode 100644
index 0000000..583ba10
--- /dev/null
+++ b/camera/camera-camera2/api/public_plus_experimental_1.1.0-beta02.txt

@@ -0,0 +1,53 @@
+// Signature format: 4.0
+package androidx.camera.camera2 {
+
+  @RequiresApi(21) public final class Camera2Config {
+    method public static androidx.camera.core.CameraXConfig defaultConfig();
+  }
+
+}
+
+package androidx.camera.camera2.interop {
+
+  @RequiresApi(21) @androidx.camera.camera2.interop.ExperimentalCamera2Interop public final class Camera2CameraControl {
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> addCaptureRequestOptions(androidx.camera.camera2.interop.CaptureRequestOptions);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> clearCaptureRequestOptions();
+    method public static androidx.camera.camera2.interop.Camera2CameraControl from(androidx.camera.core.CameraControl);
+    method public androidx.camera.camera2.interop.CaptureRequestOptions getCaptureRequestOptions();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setCaptureRequestOptions(androidx.camera.camera2.interop.CaptureRequestOptions);
+  }
+
+  @RequiresApi(21) @androidx.camera.camera2.interop.ExperimentalCamera2Interop public final class Camera2CameraInfo {
+    method public static androidx.camera.camera2.interop.Camera2CameraInfo from(androidx.camera.core.CameraInfo);
+    method public <T> T? getCameraCharacteristic(android.hardware.camera2.CameraCharacteristics.Key<T!>);
+    method public String getCameraId();
+  }
+
+  @RequiresApi(21) @androidx.camera.camera2.interop.ExperimentalCamera2Interop public final class Camera2Interop {
+  }
+
+  @RequiresApi(21) public static final class Camera2Interop.Extender<T> {
+    ctor public Camera2Interop.Extender(androidx.camera.core.ExtendableBuilder<T!>);
+    method public <ValueT> androidx.camera.camera2.interop.Camera2Interop.Extender<T!> setCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>, ValueT);
+    method public androidx.camera.camera2.interop.Camera2Interop.Extender<T!> setDeviceStateCallback(android.hardware.camera2.CameraDevice.StateCallback);
+    method public androidx.camera.camera2.interop.Camera2Interop.Extender<T!> setSessionCaptureCallback(android.hardware.camera2.CameraCaptureSession.CaptureCallback);
+    method public androidx.camera.camera2.interop.Camera2Interop.Extender<T!> setSessionStateCallback(android.hardware.camera2.CameraCaptureSession.StateCallback);
+  }
+
+  @RequiresApi(21) @androidx.camera.camera2.interop.ExperimentalCamera2Interop public class CaptureRequestOptions {
+    ctor public CaptureRequestOptions(androidx.camera.core.impl.Config);
+    method public <ValueT> ValueT? getCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>);
+  }
+
+  @RequiresApi(21) public static final class CaptureRequestOptions.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.camera2.interop.CaptureRequestOptions> {
+    ctor public CaptureRequestOptions.Builder();
+    method public androidx.camera.camera2.interop.CaptureRequestOptions build();
+    method public <ValueT> androidx.camera.camera2.interop.CaptureRequestOptions.Builder clearCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>);
+    method public <ValueT> androidx.camera.camera2.interop.CaptureRequestOptions.Builder setCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>, ValueT);
+  }
+
+  @RequiresOptIn @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExperimentalCamera2Interop {
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/camera/camera-camera2/api/res-1.1.0-beta02.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to camera/camera-camera2/api/res-1.1.0-beta02.txt

diff --git a/camera/camera-camera2/api/restricted_1.1.0-beta02.txt b/camera/camera-camera2/api/restricted_1.1.0-beta02.txt
new file mode 100644
index 0000000..1459b2c
--- /dev/null
+++ b/camera/camera-camera2/api/restricted_1.1.0-beta02.txt

@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.camera.camera2 {
+
+  @RequiresApi(21) public final class Camera2Config {
+    method public static androidx.camera.core.CameraXConfig defaultConfig();
+  }
+
+}
+

diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/SelectResolutionQuirk.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/SelectResolutionQuirk.java
index ccd9d50..1882363 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/SelectResolutionQuirk.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/quirk/SelectResolutionQuirk.java

@@ -43,6 +43,7 @@
             "SM-J710MN", // Samsung Galaxy J7 (2016)
             "SM-A320FL", // Samsung Galaxy A3 (2017)
             "SM-G570M", // Samsung Galaxy J5 Prime
+            "SM-G610F", // Samsung Galaxy J7 Prime
             "SM-G610M"); // Samsung Galaxy J7 Prime
 
     static boolean load() {

diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/quirk/ResolutionSelectorQuirkTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/quirk/ResolutionSelectorQuirkTest.java
index a824364..d7fd719 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/quirk/ResolutionSelectorQuirkTest.java
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/quirk/ResolutionSelectorQuirkTest.java

@@ -53,5 +53,7 @@
         assertThat(SelectResolutionQuirk.load()).isTrue();
         ReflectionHelpers.setStaticField(Build.class, "MODEL", "SM-G610M");
         assertThat(SelectResolutionQuirk.load()).isTrue();
+        ReflectionHelpers.setStaticField(Build.class, "MODEL", "SM-G610F");
+        assertThat(SelectResolutionQuirk.load()).isTrue();
     }
 }

diff --git a/camera/camera-core/api/1.1.0-beta02.txt b/camera/camera-core/api/1.1.0-beta02.txt
new file mode 100644
index 0000000..75e46de
--- /dev/null
+++ b/camera/camera-core/api/1.1.0-beta02.txt

@@ -0,0 +1,433 @@
+// Signature format: 4.0
+package androidx.camera.core {
+
+  @RequiresApi(21) public class AspectRatio {
+    field public static final int RATIO_16_9 = 1; // 0x1
+    field public static final int RATIO_4_3 = 0; // 0x0
+  }
+
+  @RequiresApi(21) public interface Camera {
+    method public androidx.camera.core.CameraControl getCameraControl();
+    method public androidx.camera.core.CameraInfo getCameraInfo();
+  }
+
+  @RequiresApi(21) public interface CameraControl {
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> cancelFocusAndMetering();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> enableTorch(boolean);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Integer!> setExposureCompensationIndex(int);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setLinearZoom(@FloatRange(from=0.0f, to=1.0f) float);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setZoomRatio(float);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.camera.core.FocusMeteringResult!> startFocusAndMetering(androidx.camera.core.FocusMeteringAction);
+  }
+
+  public static final class CameraControl.OperationCanceledException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraFilter {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+  }
+
+  @RequiresApi(21) public interface CameraInfo {
+    method public androidx.camera.core.CameraSelector getCameraSelector();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.CameraState!> getCameraState();
+    method public androidx.camera.core.ExposureState getExposureState();
+    method public int getSensorRotationDegrees();
+    method public int getSensorRotationDegrees(int);
+    method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
+    method public boolean hasFlashUnit();
+    method public default boolean isFocusMeteringSupported(androidx.camera.core.FocusMeteringAction);
+  }
+
+  @RequiresApi(21) public final class CameraInfoUnavailableException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraProvider {
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+  }
+
+  @RequiresApi(21) public final class CameraSelector {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+    field public static final androidx.camera.core.CameraSelector DEFAULT_BACK_CAMERA;
+    field public static final androidx.camera.core.CameraSelector DEFAULT_FRONT_CAMERA;
+    field public static final int LENS_FACING_BACK = 1; // 0x1
+    field public static final int LENS_FACING_FRONT = 0; // 0x0
+  }
+
+  public static final class CameraSelector.Builder {
+    ctor public CameraSelector.Builder();
+    method public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
+    method public androidx.camera.core.CameraSelector build();
+    method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class CameraState {
+    ctor public CameraState();
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type);
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type, androidx.camera.core.CameraState.StateError?);
+    method public abstract androidx.camera.core.CameraState.StateError? getError();
+    method public abstract androidx.camera.core.CameraState.Type getType();
+    field public static final int ERROR_CAMERA_DISABLED = 5; // 0x5
+    field public static final int ERROR_CAMERA_FATAL_ERROR = 6; // 0x6
+    field public static final int ERROR_CAMERA_IN_USE = 2; // 0x2
+    field public static final int ERROR_DO_NOT_DISTURB_MODE_ENABLED = 7; // 0x7
+    field public static final int ERROR_MAX_CAMERAS_IN_USE = 1; // 0x1
+    field public static final int ERROR_OTHER_RECOVERABLE_ERROR = 3; // 0x3
+    field public static final int ERROR_STREAM_CONFIG = 4; // 0x4
+  }
+
+  public enum CameraState.ErrorType {
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType CRITICAL;
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType RECOVERABLE;
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class CameraState.StateError {
+    ctor public CameraState.StateError();
+    method public static androidx.camera.core.CameraState.StateError create(int);
+    method public static androidx.camera.core.CameraState.StateError create(int, Throwable?);
+    method public abstract Throwable? getCause();
+    method public abstract int getCode();
+    method public androidx.camera.core.CameraState.ErrorType getType();
+  }
+
+  public enum CameraState.Type {
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSED;
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSING;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPEN;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPENING;
+    enum_constant public static final androidx.camera.core.CameraState.Type PENDING_OPEN;
+  }
+
+  @RequiresApi(21) public class CameraUnavailableException extends java.lang.Exception {
+    ctor public CameraUnavailableException(int);
+    ctor public CameraUnavailableException(int, String?);
+    ctor public CameraUnavailableException(int, String?, Throwable?);
+    ctor public CameraUnavailableException(int, Throwable?);
+    method public int getReason();
+    field public static final int CAMERA_DISABLED = 1; // 0x1
+    field public static final int CAMERA_DISCONNECTED = 2; // 0x2
+    field public static final int CAMERA_ERROR = 3; // 0x3
+    field public static final int CAMERA_IN_USE = 4; // 0x4
+    field public static final int CAMERA_MAX_IN_USE = 5; // 0x5
+    field public static final int CAMERA_UNAVAILABLE_DO_NOT_DISTURB = 6; // 0x6
+    field public static final int CAMERA_UNKNOWN_ERROR = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class CameraXConfig {
+    method public androidx.camera.core.CameraSelector? getAvailableCamerasLimiter(androidx.camera.core.CameraSelector?);
+    method public java.util.concurrent.Executor? getCameraExecutor(java.util.concurrent.Executor?);
+    method public int getMinimumLoggingLevel();
+    method public android.os.Handler? getSchedulerHandler(android.os.Handler?);
+  }
+
+  public static final class CameraXConfig.Builder {
+    method public androidx.camera.core.CameraXConfig build();
+    method public static androidx.camera.core.CameraXConfig.Builder fromConfig(androidx.camera.core.CameraXConfig);
+    method public androidx.camera.core.CameraXConfig.Builder setAvailableCamerasLimiter(androidx.camera.core.CameraSelector);
+    method public androidx.camera.core.CameraXConfig.Builder setCameraExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.CameraXConfig.Builder setMinimumLoggingLevel(@IntRange(from=android.util.Log.DEBUG, to=android.util.Log.ERROR) int);
+    method public androidx.camera.core.CameraXConfig.Builder setSchedulerHandler(android.os.Handler);
+  }
+
+  public static interface CameraXConfig.Provider {
+    method public androidx.camera.core.CameraXConfig getCameraXConfig();
+  }
+
+  @RequiresApi(21) public final class DisplayOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public DisplayOrientedMeteringPointFactory(android.view.Display, androidx.camera.core.CameraInfo, float, float);
+  }
+
+  @RequiresApi(21) public interface ExposureState {
+    method public int getExposureCompensationIndex();
+    method public android.util.Range<java.lang.Integer!> getExposureCompensationRange();
+    method public android.util.Rational getExposureCompensationStep();
+    method public boolean isExposureCompensationSupported();
+  }
+
+  @RequiresApi(21) public interface ExtendableBuilder<T> {
+    method public T build();
+  }
+
+  @RequiresApi(21) public final class FocusMeteringAction {
+    method public long getAutoCancelDurationInMillis();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAe();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAf();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAwb();
+    method public boolean isAutoCancelEnabled();
+    field public static final int FLAG_AE = 2; // 0x2
+    field public static final int FLAG_AF = 1; // 0x1
+    field public static final int FLAG_AWB = 4; // 0x4
+  }
+
+  public static class FocusMeteringAction.Builder {
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint);
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction build();
+    method public androidx.camera.core.FocusMeteringAction.Builder disableAutoCancel();
+    method public androidx.camera.core.FocusMeteringAction.Builder setAutoCancelDuration(@IntRange(from=1) long, java.util.concurrent.TimeUnit);
+  }
+
+  @RequiresApi(21) public final class FocusMeteringResult {
+    method public boolean isFocusSuccessful();
+  }
+
+  @RequiresApi(21) public final class ImageAnalysis extends androidx.camera.core.UseCase {
+    method public void clearAnalyzer();
+    method public int getBackpressureStrategy();
+    method public int getImageQueueDepth();
+    method public int getOutputImageFormat();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public boolean isOutputImageRotationEnabled();
+    method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
+    method public void setTargetRotation(int);
+    field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
+    field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
+    field public static final int STRATEGY_BLOCK_PRODUCER = 1; // 0x1
+    field public static final int STRATEGY_KEEP_ONLY_LATEST = 0; // 0x0
+  }
+
+  public static interface ImageAnalysis.Analyzer {
+    method public void analyze(androidx.camera.core.ImageProxy);
+  }
+
+  public static final class ImageAnalysis.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageAnalysis> {
+    ctor public ImageAnalysis.Builder();
+    method public androidx.camera.core.ImageAnalysis build();
+    method public androidx.camera.core.ImageAnalysis.Builder setBackgroundExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageAnalysis.Builder setBackpressureStrategy(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setImageQueueDepth(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageFormat(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageRotationEnabled(boolean);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetName(String);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetRotation(int);
+  }
+
+  @RequiresApi(21) public final class ImageCapture extends androidx.camera.core.UseCase {
+    method public int getCaptureMode();
+    method public int getFlashMode();
+    method @IntRange(from=1, to=100) public int getJpegQuality();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public void setCropAspectRatio(android.util.Rational);
+    method public void setFlashMode(int);
+    method public void setTargetRotation(int);
+    method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
+    method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
+    field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
+    field public static final int CAPTURE_MODE_MINIMIZE_LATENCY = 1; // 0x1
+    field public static final int ERROR_CAMERA_CLOSED = 3; // 0x3
+    field public static final int ERROR_CAPTURE_FAILED = 2; // 0x2
+    field public static final int ERROR_FILE_IO = 1; // 0x1
+    field public static final int ERROR_INVALID_CAMERA = 4; // 0x4
+    field public static final int ERROR_UNKNOWN = 0; // 0x0
+    field public static final int FLASH_MODE_AUTO = 0; // 0x0
+    field public static final int FLASH_MODE_OFF = 2; // 0x2
+    field public static final int FLASH_MODE_ON = 1; // 0x1
+  }
+
+  public static final class ImageCapture.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageCapture> {
+    ctor public ImageCapture.Builder();
+    method public androidx.camera.core.ImageCapture build();
+    method public androidx.camera.core.ImageCapture.Builder setCaptureMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setFlashMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setIoExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageCapture.Builder setJpegQuality(@IntRange(from=1, to=100) int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetName(String);
+    method public androidx.camera.core.ImageCapture.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageCapture.Builder setTargetRotation(int);
+  }
+
+  public static final class ImageCapture.Metadata {
+    ctor public ImageCapture.Metadata();
+    method public android.location.Location? getLocation();
+    method public boolean isReversedHorizontal();
+    method public boolean isReversedVertical();
+    method public void setLocation(android.location.Location?);
+    method public void setReversedHorizontal(boolean);
+    method public void setReversedVertical(boolean);
+  }
+
+  public abstract static class ImageCapture.OnImageCapturedCallback {
+    ctor public ImageCapture.OnImageCapturedCallback();
+    method public void onCaptureSuccess(androidx.camera.core.ImageProxy);
+    method public void onError(androidx.camera.core.ImageCaptureException);
+  }
+
+  public static interface ImageCapture.OnImageSavedCallback {
+    method public void onError(androidx.camera.core.ImageCaptureException);
+    method public void onImageSaved(androidx.camera.core.ImageCapture.OutputFileResults);
+  }
+
+  public static final class ImageCapture.OutputFileOptions {
+  }
+
+  public static final class ImageCapture.OutputFileOptions.Builder {
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.File);
+    ctor public ImageCapture.OutputFileOptions.Builder(android.content.ContentResolver, android.net.Uri, android.content.ContentValues);
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.OutputStream);
+    method public androidx.camera.core.ImageCapture.OutputFileOptions build();
+    method public androidx.camera.core.ImageCapture.OutputFileOptions.Builder setMetadata(androidx.camera.core.ImageCapture.Metadata);
+  }
+
+  public static class ImageCapture.OutputFileResults {
+    method public android.net.Uri? getSavedUri();
+  }
+
+  @RequiresApi(21) public class ImageCaptureException extends java.lang.Exception {
+    ctor public ImageCaptureException(int, String, Throwable?);
+    method public int getImageCaptureError();
+  }
+
+  @RequiresApi(21) public interface ImageInfo {
+    method public int getRotationDegrees();
+    method public default android.graphics.Matrix getSensorToBufferTransformMatrix();
+    method public long getTimestamp();
+  }
+
+  @RequiresApi(21) public interface ImageProxy extends java.lang.AutoCloseable {
+    method public void close();
+    method public android.graphics.Rect getCropRect();
+    method public int getFormat();
+    method public int getHeight();
+    method public androidx.camera.core.ImageInfo getImageInfo();
+    method public androidx.camera.core.ImageProxy.PlaneProxy![] getPlanes();
+    method public int getWidth();
+    method public void setCropRect(android.graphics.Rect?);
+  }
+
+  public static interface ImageProxy.PlaneProxy {
+    method public java.nio.ByteBuffer getBuffer();
+    method public int getPixelStride();
+    method public int getRowStride();
+  }
+
+  @RequiresApi(21) public class InitializationException extends java.lang.Exception {
+    ctor public InitializationException(String?);
+    ctor public InitializationException(String?, Throwable?);
+    ctor public InitializationException(Throwable?);
+  }
+
+  @RequiresApi(21) public class MeteringPoint {
+    method public float getSize();
+  }
+
+  @RequiresApi(21) public abstract class MeteringPointFactory {
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float);
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float, float);
+    method public static float getDefaultPointSize();
+  }
+
+  @RequiresApi(21) public final class Preview extends androidx.camera.core.UseCase {
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method @UiThread public void setSurfaceProvider(java.util.concurrent.Executor, androidx.camera.core.Preview.SurfaceProvider?);
+    method @UiThread public void setSurfaceProvider(androidx.camera.core.Preview.SurfaceProvider?);
+    method public void setTargetRotation(int);
+  }
+
+  public static final class Preview.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.Preview> {
+    ctor public Preview.Builder();
+    method public androidx.camera.core.Preview build();
+    method public androidx.camera.core.Preview.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.Preview.Builder setTargetName(String);
+    method public androidx.camera.core.Preview.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.Preview.Builder setTargetRotation(int);
+  }
+
+  public static interface Preview.SurfaceProvider {
+    method public void onSurfaceRequested(androidx.camera.core.SurfaceRequest);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class ResolutionInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract android.util.Size getResolution();
+    method public abstract int getRotationDegrees();
+  }
+
+  @RequiresApi(21) public class SurfaceOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public SurfaceOrientedMeteringPointFactory(float, float);
+    ctor public SurfaceOrientedMeteringPointFactory(float, float, androidx.camera.core.UseCase);
+  }
+
+  @RequiresApi(21) public final class SurfaceRequest {
+    method public void addRequestCancellationListener(java.util.concurrent.Executor, Runnable);
+    method public void clearTransformationInfoListener();
+    method public android.util.Size getResolution();
+    method public void provideSurface(android.view.Surface, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.camera.core.SurfaceRequest.Result!>);
+    method public void setTransformationInfoListener(java.util.concurrent.Executor, androidx.camera.core.SurfaceRequest.TransformationInfoListener);
+    method public boolean willNotProvideSurface();
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.Result {
+    method public abstract int getResultCode();
+    method public abstract android.view.Surface getSurface();
+    field public static final int RESULT_INVALID_SURFACE = 2; // 0x2
+    field public static final int RESULT_REQUEST_CANCELLED = 1; // 0x1
+    field public static final int RESULT_SURFACE_ALREADY_PROVIDED = 3; // 0x3
+    field public static final int RESULT_SURFACE_USED_SUCCESSFULLY = 0; // 0x0
+    field public static final int RESULT_WILL_NOT_PROVIDE_SURFACE = 4; // 0x4
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.TransformationInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract int getRotationDegrees();
+  }
+
+  public static interface SurfaceRequest.TransformationInfoListener {
+    method public void onTransformationInfoUpdate(androidx.camera.core.SurfaceRequest.TransformationInfo);
+  }
+
+  @RequiresApi(21) public class TorchState {
+    field public static final int OFF = 0; // 0x0
+    field public static final int ON = 1; // 0x1
+  }
+
+  @RequiresApi(21) public abstract class UseCase {
+  }
+
+  @RequiresApi(21) public final class UseCaseGroup {
+    method public java.util.List<androidx.camera.core.UseCase!> getUseCases();
+    method public androidx.camera.core.ViewPort? getViewPort();
+  }
+
+  public static final class UseCaseGroup.Builder {
+    ctor public UseCaseGroup.Builder();
+    method public androidx.camera.core.UseCaseGroup.Builder addUseCase(androidx.camera.core.UseCase);
+    method public androidx.camera.core.UseCaseGroup build();
+    method public androidx.camera.core.UseCaseGroup.Builder setViewPort(androidx.camera.core.ViewPort);
+  }
+
+  @RequiresApi(21) public final class ViewPort {
+    method public android.util.Rational getAspectRatio();
+    method public int getLayoutDirection();
+    method public int getRotation();
+    method public int getScaleType();
+    field public static final int FILL_CENTER = 1; // 0x1
+    field public static final int FILL_END = 2; // 0x2
+    field public static final int FILL_START = 0; // 0x0
+    field public static final int FIT = 3; // 0x3
+  }
+
+  public static final class ViewPort.Builder {
+    ctor public ViewPort.Builder(android.util.Rational, int);
+    method public androidx.camera.core.ViewPort build();
+    method public androidx.camera.core.ViewPort.Builder setLayoutDirection(int);
+    method public androidx.camera.core.ViewPort.Builder setScaleType(int);
+  }
+
+  @RequiresApi(21) public interface ZoomState {
+    method public float getLinearZoom();
+    method public float getMaxZoomRatio();
+    method public float getMinZoomRatio();
+    method public float getZoomRatio();
+  }
+
+}
+

diff --git a/camera/camera-core/api/public_plus_experimental_1.1.0-beta02.txt b/camera/camera-core/api/public_plus_experimental_1.1.0-beta02.txt
new file mode 100644
index 0000000..58ca9b7
--- /dev/null
+++ b/camera/camera-core/api/public_plus_experimental_1.1.0-beta02.txt

@@ -0,0 +1,437 @@
+// Signature format: 4.0
+package androidx.camera.core {
+
+  @RequiresApi(21) public class AspectRatio {
+    field public static final int RATIO_16_9 = 1; // 0x1
+    field public static final int RATIO_4_3 = 0; // 0x0
+  }
+
+  @RequiresApi(21) public interface Camera {
+    method public androidx.camera.core.CameraControl getCameraControl();
+    method public androidx.camera.core.CameraInfo getCameraInfo();
+  }
+
+  @RequiresApi(21) public interface CameraControl {
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> cancelFocusAndMetering();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> enableTorch(boolean);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Integer!> setExposureCompensationIndex(int);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setLinearZoom(@FloatRange(from=0.0f, to=1.0f) float);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setZoomRatio(float);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.camera.core.FocusMeteringResult!> startFocusAndMetering(androidx.camera.core.FocusMeteringAction);
+  }
+
+  public static final class CameraControl.OperationCanceledException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraFilter {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+  }
+
+  @RequiresApi(21) public interface CameraInfo {
+    method public androidx.camera.core.CameraSelector getCameraSelector();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.CameraState!> getCameraState();
+    method public androidx.camera.core.ExposureState getExposureState();
+    method public int getSensorRotationDegrees();
+    method public int getSensorRotationDegrees(int);
+    method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
+    method public boolean hasFlashUnit();
+    method public default boolean isFocusMeteringSupported(androidx.camera.core.FocusMeteringAction);
+  }
+
+  @RequiresApi(21) public final class CameraInfoUnavailableException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraProvider {
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+  }
+
+  @RequiresApi(21) public final class CameraSelector {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+    field public static final androidx.camera.core.CameraSelector DEFAULT_BACK_CAMERA;
+    field public static final androidx.camera.core.CameraSelector DEFAULT_FRONT_CAMERA;
+    field public static final int LENS_FACING_BACK = 1; // 0x1
+    field public static final int LENS_FACING_FRONT = 0; // 0x0
+  }
+
+  public static final class CameraSelector.Builder {
+    ctor public CameraSelector.Builder();
+    method public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
+    method public androidx.camera.core.CameraSelector build();
+    method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class CameraState {
+    ctor public CameraState();
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type);
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type, androidx.camera.core.CameraState.StateError?);
+    method public abstract androidx.camera.core.CameraState.StateError? getError();
+    method public abstract androidx.camera.core.CameraState.Type getType();
+    field public static final int ERROR_CAMERA_DISABLED = 5; // 0x5
+    field public static final int ERROR_CAMERA_FATAL_ERROR = 6; // 0x6
+    field public static final int ERROR_CAMERA_IN_USE = 2; // 0x2
+    field public static final int ERROR_DO_NOT_DISTURB_MODE_ENABLED = 7; // 0x7
+    field public static final int ERROR_MAX_CAMERAS_IN_USE = 1; // 0x1
+    field public static final int ERROR_OTHER_RECOVERABLE_ERROR = 3; // 0x3
+    field public static final int ERROR_STREAM_CONFIG = 4; // 0x4
+  }
+
+  public enum CameraState.ErrorType {
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType CRITICAL;
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType RECOVERABLE;
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class CameraState.StateError {
+    ctor public CameraState.StateError();
+    method public static androidx.camera.core.CameraState.StateError create(int);
+    method public static androidx.camera.core.CameraState.StateError create(int, Throwable?);
+    method public abstract Throwable? getCause();
+    method public abstract int getCode();
+    method public androidx.camera.core.CameraState.ErrorType getType();
+  }
+
+  public enum CameraState.Type {
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSED;
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSING;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPEN;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPENING;
+    enum_constant public static final androidx.camera.core.CameraState.Type PENDING_OPEN;
+  }
+
+  @RequiresApi(21) public class CameraUnavailableException extends java.lang.Exception {
+    ctor public CameraUnavailableException(int);
+    ctor public CameraUnavailableException(int, String?);
+    ctor public CameraUnavailableException(int, String?, Throwable?);
+    ctor public CameraUnavailableException(int, Throwable?);
+    method public int getReason();
+    field public static final int CAMERA_DISABLED = 1; // 0x1
+    field public static final int CAMERA_DISCONNECTED = 2; // 0x2
+    field public static final int CAMERA_ERROR = 3; // 0x3
+    field public static final int CAMERA_IN_USE = 4; // 0x4
+    field public static final int CAMERA_MAX_IN_USE = 5; // 0x5
+    field public static final int CAMERA_UNAVAILABLE_DO_NOT_DISTURB = 6; // 0x6
+    field public static final int CAMERA_UNKNOWN_ERROR = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class CameraXConfig {
+    method public androidx.camera.core.CameraSelector? getAvailableCamerasLimiter(androidx.camera.core.CameraSelector?);
+    method public java.util.concurrent.Executor? getCameraExecutor(java.util.concurrent.Executor?);
+    method public int getMinimumLoggingLevel();
+    method public android.os.Handler? getSchedulerHandler(android.os.Handler?);
+  }
+
+  public static final class CameraXConfig.Builder {
+    method public androidx.camera.core.CameraXConfig build();
+    method public static androidx.camera.core.CameraXConfig.Builder fromConfig(androidx.camera.core.CameraXConfig);
+    method public androidx.camera.core.CameraXConfig.Builder setAvailableCamerasLimiter(androidx.camera.core.CameraSelector);
+    method public androidx.camera.core.CameraXConfig.Builder setCameraExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.CameraXConfig.Builder setMinimumLoggingLevel(@IntRange(from=android.util.Log.DEBUG, to=android.util.Log.ERROR) int);
+    method public androidx.camera.core.CameraXConfig.Builder setSchedulerHandler(android.os.Handler);
+  }
+
+  public static interface CameraXConfig.Provider {
+    method public androidx.camera.core.CameraXConfig getCameraXConfig();
+  }
+
+  @RequiresApi(21) public final class DisplayOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public DisplayOrientedMeteringPointFactory(android.view.Display, androidx.camera.core.CameraInfo, float, float);
+  }
+
+  @RequiresApi(21) @RequiresOptIn @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExperimentalGetImage {
+  }
+
+  @RequiresApi(21) public interface ExposureState {
+    method public int getExposureCompensationIndex();
+    method public android.util.Range<java.lang.Integer!> getExposureCompensationRange();
+    method public android.util.Rational getExposureCompensationStep();
+    method public boolean isExposureCompensationSupported();
+  }
+
+  @RequiresApi(21) public interface ExtendableBuilder<T> {
+    method public T build();
+  }
+
+  @RequiresApi(21) public final class FocusMeteringAction {
+    method public long getAutoCancelDurationInMillis();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAe();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAf();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAwb();
+    method public boolean isAutoCancelEnabled();
+    field public static final int FLAG_AE = 2; // 0x2
+    field public static final int FLAG_AF = 1; // 0x1
+    field public static final int FLAG_AWB = 4; // 0x4
+  }
+
+  public static class FocusMeteringAction.Builder {
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint);
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction build();
+    method public androidx.camera.core.FocusMeteringAction.Builder disableAutoCancel();
+    method public androidx.camera.core.FocusMeteringAction.Builder setAutoCancelDuration(@IntRange(from=1) long, java.util.concurrent.TimeUnit);
+  }
+
+  @RequiresApi(21) public final class FocusMeteringResult {
+    method public boolean isFocusSuccessful();
+  }
+
+  @RequiresApi(21) public final class ImageAnalysis extends androidx.camera.core.UseCase {
+    method public void clearAnalyzer();
+    method public int getBackpressureStrategy();
+    method public int getImageQueueDepth();
+    method public int getOutputImageFormat();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public boolean isOutputImageRotationEnabled();
+    method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
+    method public void setTargetRotation(int);
+    field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
+    field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
+    field public static final int STRATEGY_BLOCK_PRODUCER = 1; // 0x1
+    field public static final int STRATEGY_KEEP_ONLY_LATEST = 0; // 0x0
+  }
+
+  public static interface ImageAnalysis.Analyzer {
+    method public void analyze(androidx.camera.core.ImageProxy);
+  }
+
+  public static final class ImageAnalysis.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageAnalysis> {
+    ctor public ImageAnalysis.Builder();
+    method public androidx.camera.core.ImageAnalysis build();
+    method public androidx.camera.core.ImageAnalysis.Builder setBackgroundExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageAnalysis.Builder setBackpressureStrategy(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setImageQueueDepth(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageFormat(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageRotationEnabled(boolean);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetName(String);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetRotation(int);
+  }
+
+  @RequiresApi(21) public final class ImageCapture extends androidx.camera.core.UseCase {
+    method public int getCaptureMode();
+    method public int getFlashMode();
+    method @IntRange(from=1, to=100) public int getJpegQuality();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public void setCropAspectRatio(android.util.Rational);
+    method public void setFlashMode(int);
+    method public void setTargetRotation(int);
+    method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
+    method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
+    field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
+    field public static final int CAPTURE_MODE_MINIMIZE_LATENCY = 1; // 0x1
+    field public static final int ERROR_CAMERA_CLOSED = 3; // 0x3
+    field public static final int ERROR_CAPTURE_FAILED = 2; // 0x2
+    field public static final int ERROR_FILE_IO = 1; // 0x1
+    field public static final int ERROR_INVALID_CAMERA = 4; // 0x4
+    field public static final int ERROR_UNKNOWN = 0; // 0x0
+    field public static final int FLASH_MODE_AUTO = 0; // 0x0
+    field public static final int FLASH_MODE_OFF = 2; // 0x2
+    field public static final int FLASH_MODE_ON = 1; // 0x1
+  }
+
+  public static final class ImageCapture.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageCapture> {
+    ctor public ImageCapture.Builder();
+    method public androidx.camera.core.ImageCapture build();
+    method public androidx.camera.core.ImageCapture.Builder setCaptureMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setFlashMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setIoExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageCapture.Builder setJpegQuality(@IntRange(from=1, to=100) int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetName(String);
+    method public androidx.camera.core.ImageCapture.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageCapture.Builder setTargetRotation(int);
+  }
+
+  public static final class ImageCapture.Metadata {
+    ctor public ImageCapture.Metadata();
+    method public android.location.Location? getLocation();
+    method public boolean isReversedHorizontal();
+    method public boolean isReversedVertical();
+    method public void setLocation(android.location.Location?);
+    method public void setReversedHorizontal(boolean);
+    method public void setReversedVertical(boolean);
+  }
+
+  public abstract static class ImageCapture.OnImageCapturedCallback {
+    ctor public ImageCapture.OnImageCapturedCallback();
+    method public void onCaptureSuccess(androidx.camera.core.ImageProxy);
+    method public void onError(androidx.camera.core.ImageCaptureException);
+  }
+
+  public static interface ImageCapture.OnImageSavedCallback {
+    method public void onError(androidx.camera.core.ImageCaptureException);
+    method public void onImageSaved(androidx.camera.core.ImageCapture.OutputFileResults);
+  }
+
+  public static final class ImageCapture.OutputFileOptions {
+  }
+
+  public static final class ImageCapture.OutputFileOptions.Builder {
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.File);
+    ctor public ImageCapture.OutputFileOptions.Builder(android.content.ContentResolver, android.net.Uri, android.content.ContentValues);
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.OutputStream);
+    method public androidx.camera.core.ImageCapture.OutputFileOptions build();
+    method public androidx.camera.core.ImageCapture.OutputFileOptions.Builder setMetadata(androidx.camera.core.ImageCapture.Metadata);
+  }
+
+  public static class ImageCapture.OutputFileResults {
+    method public android.net.Uri? getSavedUri();
+  }
+
+  @RequiresApi(21) public class ImageCaptureException extends java.lang.Exception {
+    ctor public ImageCaptureException(int, String, Throwable?);
+    method public int getImageCaptureError();
+  }
+
+  @RequiresApi(21) public interface ImageInfo {
+    method public int getRotationDegrees();
+    method public default android.graphics.Matrix getSensorToBufferTransformMatrix();
+    method public long getTimestamp();
+  }
+
+  @RequiresApi(21) public interface ImageProxy extends java.lang.AutoCloseable {
+    method public void close();
+    method public android.graphics.Rect getCropRect();
+    method public int getFormat();
+    method public int getHeight();
+    method @androidx.camera.core.ExperimentalGetImage public android.media.Image? getImage();
+    method public androidx.camera.core.ImageInfo getImageInfo();
+    method public androidx.camera.core.ImageProxy.PlaneProxy![] getPlanes();
+    method public int getWidth();
+    method public void setCropRect(android.graphics.Rect?);
+  }
+
+  public static interface ImageProxy.PlaneProxy {
+    method public java.nio.ByteBuffer getBuffer();
+    method public int getPixelStride();
+    method public int getRowStride();
+  }
+
+  @RequiresApi(21) public class InitializationException extends java.lang.Exception {
+    ctor public InitializationException(String?);
+    ctor public InitializationException(String?, Throwable?);
+    ctor public InitializationException(Throwable?);
+  }
+
+  @RequiresApi(21) public class MeteringPoint {
+    method public float getSize();
+  }
+
+  @RequiresApi(21) public abstract class MeteringPointFactory {
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float);
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float, float);
+    method public static float getDefaultPointSize();
+  }
+
+  @RequiresApi(21) public final class Preview extends androidx.camera.core.UseCase {
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method @UiThread public void setSurfaceProvider(java.util.concurrent.Executor, androidx.camera.core.Preview.SurfaceProvider?);
+    method @UiThread public void setSurfaceProvider(androidx.camera.core.Preview.SurfaceProvider?);
+    method public void setTargetRotation(int);
+  }
+
+  public static final class Preview.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.Preview> {
+    ctor public Preview.Builder();
+    method public androidx.camera.core.Preview build();
+    method public androidx.camera.core.Preview.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.Preview.Builder setTargetName(String);
+    method public androidx.camera.core.Preview.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.Preview.Builder setTargetRotation(int);
+  }
+
+  public static interface Preview.SurfaceProvider {
+    method public void onSurfaceRequested(androidx.camera.core.SurfaceRequest);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class ResolutionInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract android.util.Size getResolution();
+    method public abstract int getRotationDegrees();
+  }
+
+  @RequiresApi(21) public class SurfaceOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public SurfaceOrientedMeteringPointFactory(float, float);
+    ctor public SurfaceOrientedMeteringPointFactory(float, float, androidx.camera.core.UseCase);
+  }
+
+  @RequiresApi(21) public final class SurfaceRequest {
+    method public void addRequestCancellationListener(java.util.concurrent.Executor, Runnable);
+    method public void clearTransformationInfoListener();
+    method public android.util.Size getResolution();
+    method public void provideSurface(android.view.Surface, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.camera.core.SurfaceRequest.Result!>);
+    method public void setTransformationInfoListener(java.util.concurrent.Executor, androidx.camera.core.SurfaceRequest.TransformationInfoListener);
+    method public boolean willNotProvideSurface();
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.Result {
+    method public abstract int getResultCode();
+    method public abstract android.view.Surface getSurface();
+    field public static final int RESULT_INVALID_SURFACE = 2; // 0x2
+    field public static final int RESULT_REQUEST_CANCELLED = 1; // 0x1
+    field public static final int RESULT_SURFACE_ALREADY_PROVIDED = 3; // 0x3
+    field public static final int RESULT_SURFACE_USED_SUCCESSFULLY = 0; // 0x0
+    field public static final int RESULT_WILL_NOT_PROVIDE_SURFACE = 4; // 0x4
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.TransformationInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract int getRotationDegrees();
+  }
+
+  public static interface SurfaceRequest.TransformationInfoListener {
+    method public void onTransformationInfoUpdate(androidx.camera.core.SurfaceRequest.TransformationInfo);
+  }
+
+  @RequiresApi(21) public class TorchState {
+    field public static final int OFF = 0; // 0x0
+    field public static final int ON = 1; // 0x1
+  }
+
+  @RequiresApi(21) public abstract class UseCase {
+  }
+
+  @RequiresApi(21) public final class UseCaseGroup {
+    method public java.util.List<androidx.camera.core.UseCase!> getUseCases();
+    method public androidx.camera.core.ViewPort? getViewPort();
+  }
+
+  public static final class UseCaseGroup.Builder {
+    ctor public UseCaseGroup.Builder();
+    method public androidx.camera.core.UseCaseGroup.Builder addUseCase(androidx.camera.core.UseCase);
+    method public androidx.camera.core.UseCaseGroup build();
+    method public androidx.camera.core.UseCaseGroup.Builder setViewPort(androidx.camera.core.ViewPort);
+  }
+
+  @RequiresApi(21) public final class ViewPort {
+    method public android.util.Rational getAspectRatio();
+    method public int getLayoutDirection();
+    method public int getRotation();
+    method public int getScaleType();
+    field public static final int FILL_CENTER = 1; // 0x1
+    field public static final int FILL_END = 2; // 0x2
+    field public static final int FILL_START = 0; // 0x0
+    field public static final int FIT = 3; // 0x3
+  }
+
+  public static final class ViewPort.Builder {
+    ctor public ViewPort.Builder(android.util.Rational, int);
+    method public androidx.camera.core.ViewPort build();
+    method public androidx.camera.core.ViewPort.Builder setLayoutDirection(int);
+    method public androidx.camera.core.ViewPort.Builder setScaleType(int);
+  }
+
+  @RequiresApi(21) public interface ZoomState {
+    method public float getLinearZoom();
+    method public float getMaxZoomRatio();
+    method public float getMinZoomRatio();
+    method public float getZoomRatio();
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/camera/camera-core/api/res-1.1.0-beta02.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to camera/camera-core/api/res-1.1.0-beta02.txt

diff --git a/camera/camera-core/api/restricted_1.1.0-beta02.txt b/camera/camera-core/api/restricted_1.1.0-beta02.txt
new file mode 100644
index 0000000..75e46de
--- /dev/null
+++ b/camera/camera-core/api/restricted_1.1.0-beta02.txt

@@ -0,0 +1,433 @@
+// Signature format: 4.0
+package androidx.camera.core {
+
+  @RequiresApi(21) public class AspectRatio {
+    field public static final int RATIO_16_9 = 1; // 0x1
+    field public static final int RATIO_4_3 = 0; // 0x0
+  }
+
+  @RequiresApi(21) public interface Camera {
+    method public androidx.camera.core.CameraControl getCameraControl();
+    method public androidx.camera.core.CameraInfo getCameraInfo();
+  }
+
+  @RequiresApi(21) public interface CameraControl {
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> cancelFocusAndMetering();
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> enableTorch(boolean);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Integer!> setExposureCompensationIndex(int);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setLinearZoom(@FloatRange(from=0.0f, to=1.0f) float);
+    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setZoomRatio(float);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.camera.core.FocusMeteringResult!> startFocusAndMetering(androidx.camera.core.FocusMeteringAction);
+  }
+
+  public static final class CameraControl.OperationCanceledException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraFilter {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+  }
+
+  @RequiresApi(21) public interface CameraInfo {
+    method public androidx.camera.core.CameraSelector getCameraSelector();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.CameraState!> getCameraState();
+    method public androidx.camera.core.ExposureState getExposureState();
+    method public int getSensorRotationDegrees();
+    method public int getSensorRotationDegrees(int);
+    method public androidx.lifecycle.LiveData<java.lang.Integer!> getTorchState();
+    method public androidx.lifecycle.LiveData<androidx.camera.core.ZoomState!> getZoomState();
+    method public boolean hasFlashUnit();
+    method public default boolean isFocusMeteringSupported(androidx.camera.core.FocusMeteringAction);
+  }
+
+  @RequiresApi(21) public final class CameraInfoUnavailableException extends java.lang.Exception {
+  }
+
+  @RequiresApi(21) public interface CameraProvider {
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+  }
+
+  @RequiresApi(21) public final class CameraSelector {
+    method public java.util.List<androidx.camera.core.CameraInfo!> filter(java.util.List<androidx.camera.core.CameraInfo!>);
+    field public static final androidx.camera.core.CameraSelector DEFAULT_BACK_CAMERA;
+    field public static final androidx.camera.core.CameraSelector DEFAULT_FRONT_CAMERA;
+    field public static final int LENS_FACING_BACK = 1; // 0x1
+    field public static final int LENS_FACING_FRONT = 0; // 0x0
+  }
+
+  public static final class CameraSelector.Builder {
+    ctor public CameraSelector.Builder();
+    method public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
+    method public androidx.camera.core.CameraSelector build();
+    method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class CameraState {
+    ctor public CameraState();
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type);
+    method public static androidx.camera.core.CameraState create(androidx.camera.core.CameraState.Type, androidx.camera.core.CameraState.StateError?);
+    method public abstract androidx.camera.core.CameraState.StateError? getError();
+    method public abstract androidx.camera.core.CameraState.Type getType();
+    field public static final int ERROR_CAMERA_DISABLED = 5; // 0x5
+    field public static final int ERROR_CAMERA_FATAL_ERROR = 6; // 0x6
+    field public static final int ERROR_CAMERA_IN_USE = 2; // 0x2
+    field public static final int ERROR_DO_NOT_DISTURB_MODE_ENABLED = 7; // 0x7
+    field public static final int ERROR_MAX_CAMERAS_IN_USE = 1; // 0x1
+    field public static final int ERROR_OTHER_RECOVERABLE_ERROR = 3; // 0x3
+    field public static final int ERROR_STREAM_CONFIG = 4; // 0x4
+  }
+
+  public enum CameraState.ErrorType {
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType CRITICAL;
+    enum_constant public static final androidx.camera.core.CameraState.ErrorType RECOVERABLE;
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class CameraState.StateError {
+    ctor public CameraState.StateError();
+    method public static androidx.camera.core.CameraState.StateError create(int);
+    method public static androidx.camera.core.CameraState.StateError create(int, Throwable?);
+    method public abstract Throwable? getCause();
+    method public abstract int getCode();
+    method public androidx.camera.core.CameraState.ErrorType getType();
+  }
+
+  public enum CameraState.Type {
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSED;
+    enum_constant public static final androidx.camera.core.CameraState.Type CLOSING;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPEN;
+    enum_constant public static final androidx.camera.core.CameraState.Type OPENING;
+    enum_constant public static final androidx.camera.core.CameraState.Type PENDING_OPEN;
+  }
+
+  @RequiresApi(21) public class CameraUnavailableException extends java.lang.Exception {
+    ctor public CameraUnavailableException(int);
+    ctor public CameraUnavailableException(int, String?);
+    ctor public CameraUnavailableException(int, String?, Throwable?);
+    ctor public CameraUnavailableException(int, Throwable?);
+    method public int getReason();
+    field public static final int CAMERA_DISABLED = 1; // 0x1
+    field public static final int CAMERA_DISCONNECTED = 2; // 0x2
+    field public static final int CAMERA_ERROR = 3; // 0x3
+    field public static final int CAMERA_IN_USE = 4; // 0x4
+    field public static final int CAMERA_MAX_IN_USE = 5; // 0x5
+    field public static final int CAMERA_UNAVAILABLE_DO_NOT_DISTURB = 6; // 0x6
+    field public static final int CAMERA_UNKNOWN_ERROR = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class CameraXConfig {
+    method public androidx.camera.core.CameraSelector? getAvailableCamerasLimiter(androidx.camera.core.CameraSelector?);
+    method public java.util.concurrent.Executor? getCameraExecutor(java.util.concurrent.Executor?);
+    method public int getMinimumLoggingLevel();
+    method public android.os.Handler? getSchedulerHandler(android.os.Handler?);
+  }
+
+  public static final class CameraXConfig.Builder {
+    method public androidx.camera.core.CameraXConfig build();
+    method public static androidx.camera.core.CameraXConfig.Builder fromConfig(androidx.camera.core.CameraXConfig);
+    method public androidx.camera.core.CameraXConfig.Builder setAvailableCamerasLimiter(androidx.camera.core.CameraSelector);
+    method public androidx.camera.core.CameraXConfig.Builder setCameraExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.CameraXConfig.Builder setMinimumLoggingLevel(@IntRange(from=android.util.Log.DEBUG, to=android.util.Log.ERROR) int);
+    method public androidx.camera.core.CameraXConfig.Builder setSchedulerHandler(android.os.Handler);
+  }
+
+  public static interface CameraXConfig.Provider {
+    method public androidx.camera.core.CameraXConfig getCameraXConfig();
+  }
+
+  @RequiresApi(21) public final class DisplayOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public DisplayOrientedMeteringPointFactory(android.view.Display, androidx.camera.core.CameraInfo, float, float);
+  }
+
+  @RequiresApi(21) public interface ExposureState {
+    method public int getExposureCompensationIndex();
+    method public android.util.Range<java.lang.Integer!> getExposureCompensationRange();
+    method public android.util.Rational getExposureCompensationStep();
+    method public boolean isExposureCompensationSupported();
+  }
+
+  @RequiresApi(21) public interface ExtendableBuilder<T> {
+    method public T build();
+  }
+
+  @RequiresApi(21) public final class FocusMeteringAction {
+    method public long getAutoCancelDurationInMillis();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAe();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAf();
+    method public java.util.List<androidx.camera.core.MeteringPoint!> getMeteringPointsAwb();
+    method public boolean isAutoCancelEnabled();
+    field public static final int FLAG_AE = 2; // 0x2
+    field public static final int FLAG_AF = 1; // 0x1
+    field public static final int FLAG_AWB = 4; // 0x4
+  }
+
+  public static class FocusMeteringAction.Builder {
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint);
+    ctor public FocusMeteringAction.Builder(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint);
+    method public androidx.camera.core.FocusMeteringAction.Builder addPoint(androidx.camera.core.MeteringPoint, int);
+    method public androidx.camera.core.FocusMeteringAction build();
+    method public androidx.camera.core.FocusMeteringAction.Builder disableAutoCancel();
+    method public androidx.camera.core.FocusMeteringAction.Builder setAutoCancelDuration(@IntRange(from=1) long, java.util.concurrent.TimeUnit);
+  }
+
+  @RequiresApi(21) public final class FocusMeteringResult {
+    method public boolean isFocusSuccessful();
+  }
+
+  @RequiresApi(21) public final class ImageAnalysis extends androidx.camera.core.UseCase {
+    method public void clearAnalyzer();
+    method public int getBackpressureStrategy();
+    method public int getImageQueueDepth();
+    method public int getOutputImageFormat();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public boolean isOutputImageRotationEnabled();
+    method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
+    method public void setTargetRotation(int);
+    field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
+    field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
+    field public static final int STRATEGY_BLOCK_PRODUCER = 1; // 0x1
+    field public static final int STRATEGY_KEEP_ONLY_LATEST = 0; // 0x0
+  }
+
+  public static interface ImageAnalysis.Analyzer {
+    method public void analyze(androidx.camera.core.ImageProxy);
+  }
+
+  public static final class ImageAnalysis.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageAnalysis> {
+    ctor public ImageAnalysis.Builder();
+    method public androidx.camera.core.ImageAnalysis build();
+    method public androidx.camera.core.ImageAnalysis.Builder setBackgroundExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageAnalysis.Builder setBackpressureStrategy(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setImageQueueDepth(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageFormat(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setOutputImageRotationEnabled(boolean);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetName(String);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageAnalysis.Builder setTargetRotation(int);
+  }
+
+  @RequiresApi(21) public final class ImageCapture extends androidx.camera.core.UseCase {
+    method public int getCaptureMode();
+    method public int getFlashMode();
+    method @IntRange(from=1, to=100) public int getJpegQuality();
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method public void setCropAspectRatio(android.util.Rational);
+    method public void setFlashMode(int);
+    method public void setTargetRotation(int);
+    method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
+    method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
+    field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
+    field public static final int CAPTURE_MODE_MINIMIZE_LATENCY = 1; // 0x1
+    field public static final int ERROR_CAMERA_CLOSED = 3; // 0x3
+    field public static final int ERROR_CAPTURE_FAILED = 2; // 0x2
+    field public static final int ERROR_FILE_IO = 1; // 0x1
+    field public static final int ERROR_INVALID_CAMERA = 4; // 0x4
+    field public static final int ERROR_UNKNOWN = 0; // 0x0
+    field public static final int FLASH_MODE_AUTO = 0; // 0x0
+    field public static final int FLASH_MODE_OFF = 2; // 0x2
+    field public static final int FLASH_MODE_ON = 1; // 0x1
+  }
+
+  public static final class ImageCapture.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.ImageCapture> {
+    ctor public ImageCapture.Builder();
+    method public androidx.camera.core.ImageCapture build();
+    method public androidx.camera.core.ImageCapture.Builder setCaptureMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setFlashMode(int);
+    method public androidx.camera.core.ImageCapture.Builder setIoExecutor(java.util.concurrent.Executor);
+    method public androidx.camera.core.ImageCapture.Builder setJpegQuality(@IntRange(from=1, to=100) int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.ImageCapture.Builder setTargetName(String);
+    method public androidx.camera.core.ImageCapture.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.ImageCapture.Builder setTargetRotation(int);
+  }
+
+  public static final class ImageCapture.Metadata {
+    ctor public ImageCapture.Metadata();
+    method public android.location.Location? getLocation();
+    method public boolean isReversedHorizontal();
+    method public boolean isReversedVertical();
+    method public void setLocation(android.location.Location?);
+    method public void setReversedHorizontal(boolean);
+    method public void setReversedVertical(boolean);
+  }
+
+  public abstract static class ImageCapture.OnImageCapturedCallback {
+    ctor public ImageCapture.OnImageCapturedCallback();
+    method public void onCaptureSuccess(androidx.camera.core.ImageProxy);
+    method public void onError(androidx.camera.core.ImageCaptureException);
+  }
+
+  public static interface ImageCapture.OnImageSavedCallback {
+    method public void onError(androidx.camera.core.ImageCaptureException);
+    method public void onImageSaved(androidx.camera.core.ImageCapture.OutputFileResults);
+  }
+
+  public static final class ImageCapture.OutputFileOptions {
+  }
+
+  public static final class ImageCapture.OutputFileOptions.Builder {
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.File);
+    ctor public ImageCapture.OutputFileOptions.Builder(android.content.ContentResolver, android.net.Uri, android.content.ContentValues);
+    ctor public ImageCapture.OutputFileOptions.Builder(java.io.OutputStream);
+    method public androidx.camera.core.ImageCapture.OutputFileOptions build();
+    method public androidx.camera.core.ImageCapture.OutputFileOptions.Builder setMetadata(androidx.camera.core.ImageCapture.Metadata);
+  }
+
+  public static class ImageCapture.OutputFileResults {
+    method public android.net.Uri? getSavedUri();
+  }
+
+  @RequiresApi(21) public class ImageCaptureException extends java.lang.Exception {
+    ctor public ImageCaptureException(int, String, Throwable?);
+    method public int getImageCaptureError();
+  }
+
+  @RequiresApi(21) public interface ImageInfo {
+    method public int getRotationDegrees();
+    method public default android.graphics.Matrix getSensorToBufferTransformMatrix();
+    method public long getTimestamp();
+  }
+
+  @RequiresApi(21) public interface ImageProxy extends java.lang.AutoCloseable {
+    method public void close();
+    method public android.graphics.Rect getCropRect();
+    method public int getFormat();
+    method public int getHeight();
+    method public androidx.camera.core.ImageInfo getImageInfo();
+    method public androidx.camera.core.ImageProxy.PlaneProxy![] getPlanes();
+    method public int getWidth();
+    method public void setCropRect(android.graphics.Rect?);
+  }
+
+  public static interface ImageProxy.PlaneProxy {
+    method public java.nio.ByteBuffer getBuffer();
+    method public int getPixelStride();
+    method public int getRowStride();
+  }
+
+  @RequiresApi(21) public class InitializationException extends java.lang.Exception {
+    ctor public InitializationException(String?);
+    ctor public InitializationException(String?, Throwable?);
+    ctor public InitializationException(Throwable?);
+  }
+
+  @RequiresApi(21) public class MeteringPoint {
+    method public float getSize();
+  }
+
+  @RequiresApi(21) public abstract class MeteringPointFactory {
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float);
+    method public final androidx.camera.core.MeteringPoint createPoint(float, float, float);
+    method public static float getDefaultPointSize();
+  }
+
+  @RequiresApi(21) public final class Preview extends androidx.camera.core.UseCase {
+    method public androidx.camera.core.ResolutionInfo? getResolutionInfo();
+    method public int getTargetRotation();
+    method @UiThread public void setSurfaceProvider(java.util.concurrent.Executor, androidx.camera.core.Preview.SurfaceProvider?);
+    method @UiThread public void setSurfaceProvider(androidx.camera.core.Preview.SurfaceProvider?);
+    method public void setTargetRotation(int);
+  }
+
+  public static final class Preview.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.core.Preview> {
+    ctor public Preview.Builder();
+    method public androidx.camera.core.Preview build();
+    method public androidx.camera.core.Preview.Builder setTargetAspectRatio(int);
+    method public androidx.camera.core.Preview.Builder setTargetName(String);
+    method public androidx.camera.core.Preview.Builder setTargetResolution(android.util.Size);
+    method public androidx.camera.core.Preview.Builder setTargetRotation(int);
+  }
+
+  public static interface Preview.SurfaceProvider {
+    method public void onSurfaceRequested(androidx.camera.core.SurfaceRequest);
+  }
+
+  @RequiresApi(21) @com.google.auto.value.AutoValue public abstract class ResolutionInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract android.util.Size getResolution();
+    method public abstract int getRotationDegrees();
+  }
+
+  @RequiresApi(21) public class SurfaceOrientedMeteringPointFactory extends androidx.camera.core.MeteringPointFactory {
+    ctor public SurfaceOrientedMeteringPointFactory(float, float);
+    ctor public SurfaceOrientedMeteringPointFactory(float, float, androidx.camera.core.UseCase);
+  }
+
+  @RequiresApi(21) public final class SurfaceRequest {
+    method public void addRequestCancellationListener(java.util.concurrent.Executor, Runnable);
+    method public void clearTransformationInfoListener();
+    method public android.util.Size getResolution();
+    method public void provideSurface(android.view.Surface, java.util.concurrent.Executor, androidx.core.util.Consumer<androidx.camera.core.SurfaceRequest.Result!>);
+    method public void setTransformationInfoListener(java.util.concurrent.Executor, androidx.camera.core.SurfaceRequest.TransformationInfoListener);
+    method public boolean willNotProvideSurface();
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.Result {
+    method public abstract int getResultCode();
+    method public abstract android.view.Surface getSurface();
+    field public static final int RESULT_INVALID_SURFACE = 2; // 0x2
+    field public static final int RESULT_REQUEST_CANCELLED = 1; // 0x1
+    field public static final int RESULT_SURFACE_ALREADY_PROVIDED = 3; // 0x3
+    field public static final int RESULT_SURFACE_USED_SUCCESSFULLY = 0; // 0x0
+    field public static final int RESULT_WILL_NOT_PROVIDE_SURFACE = 4; // 0x4
+  }
+
+  @com.google.auto.value.AutoValue public abstract static class SurfaceRequest.TransformationInfo {
+    method public abstract android.graphics.Rect getCropRect();
+    method public abstract int getRotationDegrees();
+  }
+
+  public static interface SurfaceRequest.TransformationInfoListener {
+    method public void onTransformationInfoUpdate(androidx.camera.core.SurfaceRequest.TransformationInfo);
+  }
+
+  @RequiresApi(21) public class TorchState {
+    field public static final int OFF = 0; // 0x0
+    field public static final int ON = 1; // 0x1
+  }
+
+  @RequiresApi(21) public abstract class UseCase {
+  }
+
+  @RequiresApi(21) public final class UseCaseGroup {
+    method public java.util.List<androidx.camera.core.UseCase!> getUseCases();
+    method public androidx.camera.core.ViewPort? getViewPort();
+  }
+
+  public static final class UseCaseGroup.Builder {
+    ctor public UseCaseGroup.Builder();
+    method public androidx.camera.core.UseCaseGroup.Builder addUseCase(androidx.camera.core.UseCase);
+    method public androidx.camera.core.UseCaseGroup build();
+    method public androidx.camera.core.UseCaseGroup.Builder setViewPort(androidx.camera.core.ViewPort);
+  }
+
+  @RequiresApi(21) public final class ViewPort {
+    method public android.util.Rational getAspectRatio();
+    method public int getLayoutDirection();
+    method public int getRotation();
+    method public int getScaleType();
+    field public static final int FILL_CENTER = 1; // 0x1
+    field public static final int FILL_END = 2; // 0x2
+    field public static final int FILL_START = 0; // 0x0
+    field public static final int FIT = 3; // 0x3
+  }
+
+  public static final class ViewPort.Builder {
+    ctor public ViewPort.Builder(android.util.Rational, int);
+    method public androidx.camera.core.ViewPort build();
+    method public androidx.camera.core.ViewPort.Builder setLayoutDirection(int);
+    method public androidx.camera.core.ViewPort.Builder setScaleType(int);
+  }
+
+  @RequiresApi(21) public interface ZoomState {
+    method public float getLinearZoom();
+    method public float getMaxZoomRatio();
+    method public float getMinZoomRatio();
+    method public float getZoomRatio();
+  }
+
+}
+

diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 12b4bc7..dfda24e 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle

@@ -85,7 +85,7 @@
 
     externalNativeBuild {
         cmake {
-            version "3.22.1"
+            version libs.versions.cmake.get()
             path "src/main/cpp/CMakeLists.txt"
         }
     }

diff --git a/camera/camera-extensions/api/1.1.0-beta02.txt b/camera/camera-extensions/api/1.1.0-beta02.txt
new file mode 100644
index 0000000..0db7e93
--- /dev/null
+++ b/camera/camera-extensions/api/1.1.0-beta02.txt

@@ -0,0 +1,21 @@
+// Signature format: 4.0
+package androidx.camera.extensions {
+
+  @RequiresApi(21) public final class ExtensionMode {
+    field public static final int AUTO = 5; // 0x5
+    field public static final int BOKEH = 1; // 0x1
+    field public static final int FACE_RETOUCH = 4; // 0x4
+    field public static final int HDR = 2; // 0x2
+    field public static final int NIGHT = 3; // 0x3
+    field public static final int NONE = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class ExtensionsManager {
+    method public android.util.Range<java.lang.Long!>? getEstimatedCaptureLatencyRange(androidx.camera.core.CameraSelector, int);
+    method public androidx.camera.core.CameraSelector getExtensionEnabledCameraSelector(androidx.camera.core.CameraSelector, int);
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.extensions.ExtensionsManager!> getInstanceAsync(android.content.Context, androidx.camera.core.CameraProvider);
+    method public boolean isExtensionAvailable(androidx.camera.core.CameraSelector, int);
+  }
+
+}
+

diff --git a/camera/camera-extensions/api/public_plus_experimental_1.1.0-beta02.txt b/camera/camera-extensions/api/public_plus_experimental_1.1.0-beta02.txt
new file mode 100644
index 0000000..0db7e93
--- /dev/null
+++ b/camera/camera-extensions/api/public_plus_experimental_1.1.0-beta02.txt

@@ -0,0 +1,21 @@
+// Signature format: 4.0
+package androidx.camera.extensions {
+
+  @RequiresApi(21) public final class ExtensionMode {
+    field public static final int AUTO = 5; // 0x5
+    field public static final int BOKEH = 1; // 0x1
+    field public static final int FACE_RETOUCH = 4; // 0x4
+    field public static final int HDR = 2; // 0x2
+    field public static final int NIGHT = 3; // 0x3
+    field public static final int NONE = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class ExtensionsManager {
+    method public android.util.Range<java.lang.Long!>? getEstimatedCaptureLatencyRange(androidx.camera.core.CameraSelector, int);
+    method public androidx.camera.core.CameraSelector getExtensionEnabledCameraSelector(androidx.camera.core.CameraSelector, int);
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.extensions.ExtensionsManager!> getInstanceAsync(android.content.Context, androidx.camera.core.CameraProvider);
+    method public boolean isExtensionAvailable(androidx.camera.core.CameraSelector, int);
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/camera/camera-extensions/api/res-1.1.0-beta02.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to camera/camera-extensions/api/res-1.1.0-beta02.txt

diff --git a/camera/camera-extensions/api/restricted_1.1.0-beta02.txt b/camera/camera-extensions/api/restricted_1.1.0-beta02.txt
new file mode 100644
index 0000000..0db7e93
--- /dev/null
+++ b/camera/camera-extensions/api/restricted_1.1.0-beta02.txt

@@ -0,0 +1,21 @@
+// Signature format: 4.0
+package androidx.camera.extensions {
+
+  @RequiresApi(21) public final class ExtensionMode {
+    field public static final int AUTO = 5; // 0x5
+    field public static final int BOKEH = 1; // 0x1
+    field public static final int FACE_RETOUCH = 4; // 0x4
+    field public static final int HDR = 2; // 0x2
+    field public static final int NIGHT = 3; // 0x3
+    field public static final int NONE = 0; // 0x0
+  }
+
+  @RequiresApi(21) public final class ExtensionsManager {
+    method public android.util.Range<java.lang.Long!>? getEstimatedCaptureLatencyRange(androidx.camera.core.CameraSelector, int);
+    method public androidx.camera.core.CameraSelector getExtensionEnabledCameraSelector(androidx.camera.core.CameraSelector, int);
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.extensions.ExtensionsManager!> getInstanceAsync(android.content.Context, androidx.camera.core.CameraProvider);
+    method public boolean isExtensionAvailable(androidx.camera.core.CameraSelector, int);
+  }
+
+}
+

diff --git a/camera/camera-lifecycle/api/1.1.0-beta02.txt b/camera/camera-lifecycle/api/1.1.0-beta02.txt
new file mode 100644
index 0000000..7077f67
--- /dev/null
+++ b/camera/camera-lifecycle/api/1.1.0-beta02.txt

@@ -0,0 +1,16 @@
+// Signature format: 4.0
+package androidx.camera.lifecycle {
+
+  @RequiresApi(21) public final class ProcessCameraProvider implements androidx.camera.core.CameraProvider {
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+    method public boolean isBound(androidx.camera.core.UseCase);
+    method @MainThread public void unbind(androidx.camera.core.UseCase!...);
+    method @MainThread public void unbindAll();
+  }
+
+}
+

diff --git a/camera/camera-lifecycle/api/public_plus_experimental_1.1.0-beta02.txt b/camera/camera-lifecycle/api/public_plus_experimental_1.1.0-beta02.txt
new file mode 100644
index 0000000..c9ff443
--- /dev/null
+++ b/camera/camera-lifecycle/api/public_plus_experimental_1.1.0-beta02.txt

@@ -0,0 +1,20 @@
+// Signature format: 4.0
+package androidx.camera.lifecycle {
+
+  @RequiresOptIn @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExperimentalCameraProviderConfiguration {
+  }
+
+  @RequiresApi(21) public final class ProcessCameraProvider implements androidx.camera.core.CameraProvider {
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+    method @androidx.camera.lifecycle.ExperimentalCameraProviderConfiguration public static void configureInstance(androidx.camera.core.CameraXConfig);
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+    method public boolean isBound(androidx.camera.core.UseCase);
+    method @MainThread public void unbind(androidx.camera.core.UseCase!...);
+    method @MainThread public void unbindAll();
+  }
+
+}
+

diff --git a/localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt b/camera/camera-lifecycle/api/res-1.1.0-beta02.txt
similarity index 100%
copy from localbroadcastmanager/localbroadcastmanager/api/res-1.0.0.txt
copy to camera/camera-lifecycle/api/res-1.1.0-beta02.txt

diff --git a/camera/camera-lifecycle/api/restricted_1.1.0-beta02.txt b/camera/camera-lifecycle/api/restricted_1.1.0-beta02.txt
new file mode 100644
index 0000000..7077f67
--- /dev/null
+++ b/camera/camera-lifecycle/api/restricted_1.1.0-beta02.txt

@@ -0,0 +1,16 @@
+// Signature format: 4.0
+package androidx.camera.lifecycle {
+
+  @RequiresApi(21) public final class ProcessCameraProvider implements androidx.camera.core.CameraProvider {
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+    method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+    method public java.util.List<androidx.camera.core.CameraInfo!> getAvailableCameraInfos();
+    method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
+    method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
+    method public boolean isBound(androidx.camera.core.UseCase);
+    method @MainThread public void unbind(androidx.camera.core.UseCase!...);
+    method @MainThread public void unbindAll();
+  }
+
+}
+

diff --git a/camera/camera-previewview/build.gradle b/camera/camera-previewview/build.gradle
index eb5bf9f..845d00d 100644
--- a/camera/camera-previewview/build.gradle
+++ b/camera/camera-previewview/build.gradle

@@ -32,11 +32,33 @@
     implementation("androidx.concurrent:concurrent-futures:1.0.0")
     implementation(libs.autoValueAnnotations)
     implementation("androidx.appcompat:appcompat:1.1.0")
+    implementation("androidx.test.espresso:espresso-idling-resource:3.1.0")
+
     // Added for annotation-experimental
     compileOnly(libs.kotlinStdlib)
 
-    annotationProcessor(libs.nullaway)
     annotationProcessor(libs.autoValue)
+
+    testImplementation(libs.testRunner)
+    testImplementation(libs.mockitoCore)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.kotlinStdlib)
+    testImplementation(libs.truth)
+    testImplementation(libs.testRules)
+    testImplementation(libs.testCore)
+
+    androidTestImplementation(libs.multidex)
+    androidTestImplementation(libs.mockitoCore)
+    androidTestImplementation(libs.espressoCore)
+    androidTestImplementation(libs.testExtJunit)
+    androidTestImplementation(libs.testCore)
+    androidTestImplementation(libs.testRunner)
+    androidTestImplementation(libs.testRules)
+    androidTestImplementation(libs.testUiautomator)
+    androidTestImplementation(libs.kotlinStdlib)
+    androidTestImplementation(libs.truth)
+    androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker
+    androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker
 }
 
 android {

diff --git a/camera/camera-previewview/lint-baseline.xml b/camera/camera-previewview/lint-baseline.xml
new file mode 100644
index 0000000..a35ba7c
--- /dev/null
+++ b/camera/camera-previewview/lint-baseline.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.2.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (7.2.0-alpha07)" variant="all" version="7.2.0-alpha07">
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
+        errorLine1="    ListenableFuture&lt;O> apply(@Nullable I input) throws Exception;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/previewview/internal/utils/futures/AsyncFunction.java"
+            line="50"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
+        errorLine1="    void onFailure(Throwable t);"
+        errorLine2="                   ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/previewview/internal/utils/futures/FutureCallback.java"
+            line="50"
+            column="20"/>
+    </issue>
+
+</issues>

diff --git a/camera/camera-previewview/src/androidTest/AndroidManifest.xml b/camera/camera-previewview/src/androidTest/AndroidManifest.xml
index 4e32fa9..f74bdac 100644
--- a/camera/camera-previewview/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-previewview/src/androidTest/AndroidManifest.xml

@@ -16,6 +16,29 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.camera.previewview.test">
+    package="androidx.camera.previewview">
     <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
+
+    <application>
+        <activity
+            android:name="androidx.camera.previewview.utils.ForegroundTestActivity"
+            android:exported="true"
+            android:configChanges="orientation|screenSize"
+            android:label="ForegroundTestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="androidx.camera.previewview.utils.FakeActivity"
+            android:exported="true"
+            android:label="Fake Activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>

diff --git a/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/SurfaceViewImplementationTest.kt b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/SurfaceViewImplementationTest.kt
new file mode 100644
index 0000000..8b75ac5
--- /dev/null
+++ b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/SurfaceViewImplementationTest.kt

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2022 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.camera.previewview
+
+import android.content.Context
+import android.hardware.display.DisplayManager
+import android.util.Size
+import android.view.Display
+import android.view.View
+import android.widget.FrameLayout
+import androidx.camera.previewview.utils.CoreAppTestUtil
+import androidx.camera.previewview.utils.FakeActivity
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.platform.app.InstrumentationRegistry
+import java.util.concurrent.TimeUnit
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = 21)
+class SurfaceViewImplementationTest {
+
+    companion object {
+        private const val ANY_WIDTH = 640
+        private const val ANY_HEIGHT = 480
+        private val ANY_SIZE: Size by lazy { Size(ANY_WIDTH, ANY_HEIGHT) }
+    }
+
+    private lateinit var mParent: FrameLayout
+    private lateinit var mImplementation: SurfaceViewImplementation
+    private val mInstrumentation = InstrumentationRegistry.getInstrumentation()
+    private lateinit var mSurfaceRequest: PreviewSurfaceRequest
+    private lateinit var mContext: Context
+    private lateinit var mDisplay: Display
+
+    // Shows the view in activity so that SurfaceView can work normally
+    private lateinit var mActivityScenario: ActivityScenario<FakeActivity>
+
+    @Before
+    fun setUp() {
+        CoreAppTestUtil.prepareDeviceUI(mInstrumentation)
+
+        mActivityScenario = ActivityScenario.launch(FakeActivity::class.java)
+        mContext = ApplicationProvider.getApplicationContext()
+        mParent = FrameLayout(mContext)
+        setContentView(mParent)
+
+        val displayManager = mContext.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
+        mDisplay = displayManager.getDisplay(0)
+
+        mSurfaceRequest = PreviewSurfaceRequest(
+            ANY_SIZE,
+            mDisplay,
+            /*isLegacyDevice=*/true,
+            /*isFrontCamera=*/true,
+            /*sensorOrientation=*/0)
+        mImplementation = SurfaceViewImplementation(mParent, PreviewTransformation())
+    }
+
+    @After
+    fun tearDown() {
+        mSurfaceRequest.previewSurface.close()
+    }
+
+    @Test
+    fun surfaceProvidedSuccessfully() {
+        CoreAppTestUtil.checkKeyguard(mContext)
+
+        mInstrumentation.runOnMainSync {
+            mImplementation.onSurfaceRequested(mSurfaceRequest)
+        }
+
+        mSurfaceRequest.previewSurface.surface.get(1000, TimeUnit.MILLISECONDS)
+        mSurfaceRequest.previewSurface.close()
+    }
+
+    @Throws(Throwable::class)
+    private fun setContentView(view: View) {
+        mActivityScenario.onActivity { activity -> activity.setContentView(view) }
+    }
+}
\ No newline at end of file

diff --git a/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/TextureViewImplementationTest.kt b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/TextureViewImplementationTest.kt
new file mode 100644
index 0000000..9a35c85
--- /dev/null
+++ b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/TextureViewImplementationTest.kt

@@ -0,0 +1,266 @@
+/*
+ * Copyright 2022 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.camera.previewview
+
+import android.content.Context.DISPLAY_SERVICE
+import android.graphics.SurfaceTexture
+import android.hardware.display.DisplayManager
+import android.os.Build
+import android.util.Size
+import android.view.Display
+import android.view.TextureView
+import android.widget.FrameLayout
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.common.truth.Truth
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = 21)
+class TextureViewImplementationTest {
+    private var parent: FrameLayout? = null
+    private var implementation: TextureViewImplementation? = null
+    private var surfaceTexture: SurfaceTexture? = null
+    private var _surfaceRequest: PreviewSurfaceRequest? = null
+    private val surfaceRequest: PreviewSurfaceRequest
+        get() {
+            if (_surfaceRequest == null) {
+                _surfaceRequest = PreviewSurfaceRequest(
+                    ANY_SIZE,
+                    display,
+                    /*isLegacyDevice=*/true,
+                    /*isFrontCamera=*/true,
+                    /*sensorOrientation=*/0)
+            }
+            return _surfaceRequest!!
+        }
+
+    private lateinit var display: Display
+
+    @Before
+    fun setUp() {
+        val mContext = InstrumentationRegistry.getInstrumentation().targetContext
+        surfaceTexture = SurfaceTexture(0)
+        parent = FrameLayout(mContext)
+        val displayManager = mContext.getSystemService(DISPLAY_SERVICE) as DisplayManager
+        display = displayManager.getDisplay(0)
+        implementation = TextureViewImplementation(parent!!, PreviewTransformation())
+    }
+
+    @After
+    fun tearDown() {
+        if (_surfaceRequest != null) {
+            _surfaceRequest!!.willNotProvideSurface()
+            // Ensure all successful requests have their returned future finish.
+            _surfaceRequest!!.previewSurface.close()
+            _surfaceRequest = null
+        }
+    }
+
+    @LargeTest
+    @Test(expected = TimeoutException::class)
+    @Throws(
+        Exception::class
+    )
+    fun doNotProvideSurface_ifSurfaceTextureNotAvailableYet() {
+        val request = surfaceRequest
+        implementation!!.onSurfaceRequested(request)
+        request.previewSurface.surface[2, TimeUnit.SECONDS]
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun provideSurface_ifSurfaceTextureAvailable() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val surfaceListenableFuture = surfaceRequest.previewSurface.surface
+        implementation!!.mTextureView
+            ?.surfaceTextureListener!!
+            .onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        val surface = surfaceListenableFuture.get()
+        Truth.assertThat(surface).isNotNull()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun doNotDestroySurface_whenSurfaceTextureBeingDestroyed_andCameraUsingSurface() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val surfaceListenableFuture = surfaceRequest.previewSurface.surface
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        surfaceListenableFuture.get()
+        Truth.assertThat(implementation!!.mSurfaceReleaseFuture).isNotNull()
+        Truth.assertThat(
+            surfaceTextureListener.onSurfaceTextureDestroyed(
+                surfaceTexture!!
+            )
+        ).isFalse()
+    }
+
+    @Test
+    @LargeTest
+    @Throws(Exception::class)
+    fun destroySurface_whenSurfaceTextureBeingDestroyed_andCameraNotUsingSurface() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val deferrableSurface = surfaceRequest.previewSurface
+        val surfaceListenableFuture = deferrableSurface.surface
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        surfaceListenableFuture.get()
+        deferrableSurface.close()
+
+        // Wait enough time for surfaceReleaseFuture's listener to be called
+        Thread.sleep(1000)
+        Truth.assertThat(implementation!!.mSurfaceReleaseFuture).isNull()
+        Truth.assertThat(
+            surfaceTextureListener.onSurfaceTextureDestroyed(
+                surfaceTexture!!
+            )
+        ).isTrue()
+    }
+
+    @Test
+    @LargeTest
+    @Throws(Exception::class)
+    fun releaseSurfaceTexture_afterSurfaceTextureDestroyed_andCameraNoLongerUsingSurface() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val deferrableSurface = surfaceRequest.previewSurface
+        val surfaceListenableFuture = deferrableSurface.surface
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        surfaceListenableFuture.get()
+        surfaceTextureListener.onSurfaceTextureDestroyed(surfaceTexture!!)
+        deferrableSurface.close()
+
+        // Wait enough time for surfaceReleaseFuture's listener to be called
+        Thread.sleep(1000)
+        Truth.assertThat(implementation!!.mSurfaceReleaseFuture).isNull()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Truth.assertThat(surfaceTexture!!.isReleased).isTrue()
+        }
+    }
+
+    @Test
+    @LargeTest
+    @Throws(Exception::class)
+    fun nullSurfaceCompleterAndSurfaceReleaseFuture_whenSurfaceProviderCancelled() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        // Cancel the request from the camera side
+        surfaceRequest.previewSurface.surface.cancel(true)
+
+        // Wait enough time for mCompleter's cancellation listener to be called
+        Thread.sleep(1000)
+        Truth.assertThat(implementation!!.mSurfaceRequest).isNull()
+        Truth.assertThat(implementation!!.mSurfaceReleaseFuture).isNull()
+    }
+
+    @Test
+    @LargeTest
+    @Throws(Exception::class)
+    fun releaseSurface_whenSurfaceTextureDestroyed_andCameraSurfaceRequestIsCancelled() {
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        // Cancel the request from the client side
+        surfaceRequest.willNotProvideSurface()
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        // Wait enough time for surfaceReleaseFuture's listener to be called.
+        Thread.sleep(1000)
+        Truth.assertThat(
+            surfaceTextureListener.onSurfaceTextureDestroyed(
+                surfaceTexture!!
+            )
+        ).isTrue()
+        Truth.assertThat(implementation!!.mSurfaceTexture).isNull()
+    }
+
+    @Test
+    fun doNotCreateTextureView_beforeSensorOutputSizeKnown() {
+        Truth.assertThat(parent!!.childCount).isEqualTo(0)
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun resetSurfaceTextureOnDetachAndAttachWindow() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val deferrableSurface = surfaceRequest.previewSurface
+        val surfaceListenableFuture = deferrableSurface.surface
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        surfaceListenableFuture.get()
+        surfaceTextureListener.onSurfaceTextureDestroyed(surfaceTexture!!)
+        Truth.assertThat(implementation!!.mDetachedSurfaceTexture).isNotNull()
+        implementation!!.onDetachedFromWindow()
+        implementation!!.onAttachedToWindow()
+        Truth.assertThat(implementation!!.mDetachedSurfaceTexture).isNull()
+        Truth.assertThat(implementation!!.mTextureView?.surfaceTexture).isEqualTo(surfaceTexture)
+    }
+
+    @Test
+    @LargeTest
+    @Throws(Exception::class)
+    fun releaseDetachedSurfaceTexture_whenDeferrableSurfaceClose() {
+        val surfaceRequest = surfaceRequest
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        val deferrableSurface = surfaceRequest.previewSurface
+        val surfaceListenableFuture = deferrableSurface.surface
+        val surfaceTextureListener = implementation!!.mTextureView?.surfaceTextureListener
+        surfaceTextureListener!!.onSurfaceTextureAvailable(surfaceTexture!!, ANY_WIDTH, ANY_HEIGHT)
+        surfaceListenableFuture.get()
+        surfaceTextureListener.onSurfaceTextureDestroyed(surfaceTexture!!)
+        Truth.assertThat(implementation!!.mDetachedSurfaceTexture).isNotNull()
+        deferrableSurface.close()
+
+        // Wait enough time for surfaceReleaseFuture's listener to be called
+        Thread.sleep(1000)
+        Truth.assertThat(implementation!!.mSurfaceReleaseFuture).isNull()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Truth.assertThat(surfaceTexture!!.isReleased).isTrue()
+        }
+        Truth.assertThat(implementation!!.mDetachedSurfaceTexture).isNull()
+    }
+
+    @Test
+    fun keepOnlyLatestTextureView_whenGetSurfaceProviderCalledMultipleTimes() {
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        Truth.assertThat(parent!!.getChildAt(0)).isInstanceOf(TextureView::class.java)
+        val textureView1 = parent!!.getChildAt(0) as TextureView
+        implementation!!.onSurfaceRequested(surfaceRequest)
+        Truth.assertThat(parent!!.getChildAt(0)).isInstanceOf(TextureView::class.java)
+        val textureView2 = parent!!.getChildAt(0) as TextureView
+        Truth.assertThat(textureView1).isNotSameInstanceAs(textureView2)
+        Truth.assertThat(parent!!.childCount).isEqualTo(1)
+    }
+
+    companion object {
+        private const val ANY_WIDTH = 1600
+        private const val ANY_HEIGHT = 1200
+        private val ANY_SIZE: Size by lazy { Size(ANY_WIDTH, ANY_HEIGHT) }
+    }
+}
\ No newline at end of file

diff --git a/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/CoreAppTestUtil.java b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/CoreAppTestUtil.java
new file mode 100644
index 0000000..fe4c243
--- /dev/null
+++ b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/CoreAppTestUtil.java

@@ -0,0 +1,240 @@
+/*
+ * Copyright 2022 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.camera.previewview.utils;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.camera.previewview.internal.utils.Logger;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import org.junit.AssumptionViolatedException;
+
+import java.io.IOException;
+
+/** Utility functions of tests on CoreTestApp. */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public final class CoreAppTestUtil {
+
+    /** ADB shell input key code for dismissing keyguard for device with API level <= 22. */
+    private static final int DISMISS_LOCK_SCREEN_CODE = 82;
+    /** ADB shell command for dismissing keyguard for device with API level >= 23. */
+    private static final String ADB_SHELL_DISMISS_KEYGUARD_API23_AND_ABOVE = "wm dismiss-keyguard";
+    /** ADB shell command to set the screen always on when usb is connected. */
+    private static final String ADB_SHELL_SCREEN_ALWAYS_ON = "svc power stayon true";
+
+    private static final int MAX_TIMEOUT_MS = 3000;
+
+    private CoreAppTestUtil() {
+    }
+
+    /**
+     * Check if this is compatible device for test.
+     *
+     * <p> Most devices should be compatible except devices with compatible issues.
+     *
+     */
+    public static void assumeCompatibleDevice() {
+        // TODO(b/134894604) This will be removed once the issue is fixed.
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
+                && Build.MODEL.contains("Nexus 5")) {
+            throw new AssumptionViolatedException("Known issue, b/134894604.");
+        }
+    }
+
+    /**
+     * Throws the Exception for the devices which is not compatible to the testing.
+     */
+    public static void assumeCanTestCameraDisconnect() {
+        // TODO(b/141656413) Remove this when the issue is fixed.
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M
+                && (Build.MODEL.contains("Nexus 5") || Build.MODEL.contains("Pixel C"))) {
+            throw new AssumptionViolatedException("Known issue, b/141656413.");
+        }
+    }
+
+    /**
+     * Clean up the device UI and back to the home screen for test.
+     * @param instrumentation the instrumentation used to run the test
+     */
+    @SuppressLint("MissingPermission") // Permission needed for action_close_system_dialogs in S
+    @SuppressWarnings("deprecation")
+    public static void clearDeviceUI(@NonNull Instrumentation instrumentation) {
+        UiDevice device = UiDevice.getInstance(instrumentation);
+        // On some devices, its necessary to wake up the device before attempting unlock, otherwise
+        // unlock attempt will not unlock.
+        try {
+            device.wakeUp();
+        } catch (RemoteException remoteException) {
+        }
+
+        // In case the lock screen on top, the action to dismiss it.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            device.pressKeyCode(DISMISS_LOCK_SCREEN_CODE);
+        } else {
+            try {
+                device.executeShellCommand(ADB_SHELL_DISMISS_KEYGUARD_API23_AND_ABOVE);
+            } catch (IOException e) {
+            }
+        }
+
+        try {
+            device.executeShellCommand(ADB_SHELL_SCREEN_ALWAYS_ON);
+        } catch (IOException e) {
+        }
+
+        device.pressHome();
+        device.waitForIdle(MAX_TIMEOUT_MS);
+
+        // Close system dialogs first to avoid interrupt.
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            instrumentation.getTargetContext().sendBroadcast(
+                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+        }
+    }
+
+    /**
+     * Checks whether keyguard is locked.
+     *
+     * Keyguard is locked if the screen is off or the device is currently locked and requires a
+     * PIN, pattern or password to unlock.
+     *
+     * @throws IllegalStateException if keyguard is locked.
+     */
+    public static void checkKeyguard(@NonNull Context context) {
+        KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(
+                Context.KEYGUARD_SERVICE);
+
+        if (keyguardManager != null && keyguardManager.isKeyguardLocked()) {
+            throw new IllegalStateException("<KEYGUARD_STATE_ERROR> Keyguard is locked!");
+        }
+    }
+
+    /**
+     * Try to clear the UI and then check if there is any dialog or lock screen on the top of the
+     * window that might cause the activity related test fail.
+     *
+     * @param instrumentation The instrumentation instance.
+     * @throws ForegroundOccupiedError throw the exception when the test app cannot get
+     *                                 foreground of the device window in CameraX lab.
+     */
+    public static void prepareDeviceUI(@NonNull Instrumentation instrumentation)
+            throws ForegroundOccupiedError {
+        clearDeviceUI(instrumentation);
+
+        ForegroundTestActivity activityRef = null;
+        try {
+            Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+            Intent startIntent = new Intent(Intent.ACTION_MAIN);
+            startIntent.setClassName(context.getPackageName(),
+                    ForegroundTestActivity.class.getName());
+            startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            activityRef = ForegroundTestActivity.class.cast(
+                    instrumentation.startActivitySync(startIntent));
+            instrumentation.waitForIdleSync();
+
+            if (activityRef == null) {
+                Logger.d("CoreAppTestUtil", String.format("Activity %s, failed to launch",
+                        startIntent.getComponent()) + ", ignore the foreground checking");
+                return;
+            }
+            IdlingRegistry.getInstance().register(activityRef.getViewReadyIdlingResource());
+
+            // The {@link Espresso#onIdle()} throws timeout exception if the
+            // ForegroundTestActivity cannot get focus. The default timeout in espresso is 26 sec.
+            Espresso.onIdle();
+            return;
+        } catch (Exception e) {
+            Logger.d("CoreAppTestUtil", "Fail to get foreground", e);
+        } finally {
+            if (activityRef != null) {
+                IdlingRegistry.getInstance().unregister(activityRef.getViewReadyIdlingResource());
+                final Activity act = activityRef;
+                instrumentation.runOnMainSync(() -> act.finish());
+                instrumentation.waitForIdleSync();
+            }
+        }
+
+        // Throw AssumptionViolatedException to skip the test if not in the CameraX lab
+        // environment. The loggable tag will be set when running the CameraX daily testing.
+        assumeTrue(Log.isLoggable("MH", Log.DEBUG));
+
+        throw new ForegroundOccupiedError("CameraX_fail_to_start_foreground, model:" + Build.MODEL);
+    }
+
+    /** The display foreground of the device is occupied that cannot execute UI related test. */
+    public static class ForegroundOccupiedError extends Exception {
+        public ForegroundOccupiedError(@NonNull String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * Launch activity and return the activity instance for testing.
+     *
+     * @param instrumentation The instrumentation used to run the test
+     * @param activityClass   The activity under test. This must be a class in the instrumentation
+     *                        targetPackage specified in the AndroidManifest.xml
+     * @param startIntent     The Intent that will be used to start the Activity under test. If
+     *                        {@code startIntent} is null, a default launch Intent for the
+     *                        {@code activityClass} is used.
+     * @param <T>             The Activity class under test
+     * @return Returns the reference to the activity for test.
+     */
+    @Nullable
+    public static <T extends Activity> T launchActivity(@NonNull Instrumentation instrumentation,
+            @NonNull Class<T> activityClass, @Nullable Intent startIntent) {
+        Context context = instrumentation.getTargetContext();
+
+        // inject custom intent, if provided
+        if (null == startIntent) {
+            startIntent = new Intent(Intent.ACTION_MAIN);
+        }
+
+        // Set target component if not set Intent
+        if (null == startIntent.getComponent()) {
+            startIntent.setClassName(context.getPackageName(), activityClass.getName());
+        }
+
+        // Set launch flags where if not set Intent
+        if (0 /* No flags set */ == startIntent.getFlags()) {
+            startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+
+        T activityRef = activityClass.cast(instrumentation.startActivitySync(startIntent));
+        instrumentation.waitForIdleSync();
+
+        return activityRef;
+    }
+}

diff --git a/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/FakeActivity.java b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/FakeActivity.java
new file mode 100644
index 0000000..576743f
--- /dev/null
+++ b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/FakeActivity.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 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.camera.previewview.utils;
+
+import android.app.Activity;
+
+import androidx.annotation.RequiresApi;
+
+/** A fake {@link Activity} that can be used in tests. */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class FakeActivity extends Activity {
+}

diff --git a/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/ForegroundTestActivity.java b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/ForegroundTestActivity.java
new file mode 100644
index 0000000..61a72c0
--- /dev/null
+++ b/camera/camera-previewview/src/androidTest/java/androidx/camera/previewview/utils/ForegroundTestActivity.java

@@ -0,0 +1,51 @@
+/*
+ * 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.camera.previewview.utils;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.test.espresso.idling.CountingIdlingResource;
+
+/** An empty activity that checks the activity's <em>main</em> window currently has window focus. */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class ForegroundTestActivity extends Activity {
+
+    final CountingIdlingResource mViewReady = new CountingIdlingResource("ViewReady");
+
+    @NonNull
+    public CountingIdlingResource getViewReadyIdlingResource() {
+        return mViewReady;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mViewReady.increment();
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if (hasFocus && !mViewReady.isIdleNow()) {
+            mViewReady.decrement();
+        }
+    }
+}

diff --git a/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraPreviewView.java b/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraPreviewView.java
deleted file mode 100644
index 707be7e..0000000
--- a/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraPreviewView.java
+++ /dev/null

@@ -1,322 +0,0 @@
-/*
- * Copyright 2022 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.camera.previewview;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.widget.FrameLayout;
-
-import androidx.annotation.ColorRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.UiThread;
-import androidx.camera.previewview.surface.PreviewSurfaceRequest;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.ViewCompat;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Custom View that displays the camera feed for Camera2 and CameraX.
- *
- * <p> This class manages the preview {@link Surface}'s lifecycle. It internally uses either a
- * {@link TextureView} or {@link SurfaceView} to display the camera feed, and applies required
- * transformations on them to correctly display the preview, this involves correcting their
- * aspect ratio, scale and rotation.
- */
-@RequiresApi(21)
-public final class CameraPreviewView extends FrameLayout {
-
-    private static final String TAG = "PreviewView";
-
-    @ColorRes
-    static final int DEFAULT_BACKGROUND_COLOR = android.R.color.black;
-    private static final ImplementationMode DEFAULT_IMPL_MODE = ImplementationMode.PERFORMANCE;
-
-    @NonNull
-    ImplementationMode mImplementationMode = DEFAULT_IMPL_MODE;
-
-    @Nullable
-    PreviewViewImplementation mImplementation;
-
-    @NonNull
-    final PreviewTransformation mPreviewTransform = new PreviewTransformation();
-
-    @UiThread
-    public CameraPreviewView(@NonNull Context context) {
-        this(context, null);
-    }
-
-    @UiThread
-    public CameraPreviewView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    @UiThread
-    public CameraPreviewView(@NonNull Context context,
-            @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    @UiThread
-    public CameraPreviewView(@NonNull Context context,
-            @Nullable AttributeSet attrs,
-            int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        final TypedArray attributes = context.getTheme().obtainStyledAttributes(attrs,
-                R.styleable.PreviewView, defStyleAttr, defStyleRes);
-        ViewCompat.saveAttributeDataForStyleable(this, context, R.styleable.PreviewView, attrs,
-                attributes, defStyleAttr, defStyleRes);
-
-        try {
-            final int scaleTypeId = attributes.getInteger(
-                    R.styleable.PreviewView_scaleType,
-                    mPreviewTransform.getScaleType().getId());
-            setScaleType(ScaleType.fromId(scaleTypeId));
-
-            int implementationModeId =
-                    attributes.getInteger(R.styleable.PreviewView_implementationMode,
-                            DEFAULT_IMPL_MODE.getId());
-            setImplementationMode(ImplementationMode.fromId(implementationModeId));
-        } finally {
-            attributes.recycle();
-        }
-
-        // Set background only if it wasn't already set. A default background prevents the content
-        // behind the PreviewView from being visible before the preview starts streaming.
-        if (getBackground() == null) {
-            setBackgroundColor(ContextCompat.getColor(getContext(), DEFAULT_BACKGROUND_COLOR));
-        }
-    }
-
-    /**
-     * Sets the {@link ImplementationMode} for the {@link CameraPreviewView}.
-     *
-     * <p> {@link CameraPreviewView} displays the preview with a {@link TextureView} when the
-     * mode is {@link ImplementationMode#COMPATIBLE}, and tries to use a {@link SurfaceView} if
-     * it is {@link ImplementationMode#PERFORMANCE} when possible, which depends on the device's
-     * attributes (e.g. API level). If not set, the default mode is
-     * {@link ImplementationMode#PERFORMANCE}.
-     */
-    @UiThread
-    public void setImplementationMode(@NonNull final ImplementationMode implementationMode) {
-        mImplementationMode = implementationMode;
-    }
-
-    /**
-     * Returns the {@link ImplementationMode}.
-     *
-     * <p> If nothing is set via {@link #setImplementationMode}, the default
-     * value is {@link ImplementationMode#PERFORMANCE}.
-     *
-     * @return The {@link ImplementationMode} for {@link CameraPreviewView}.
-     */
-    @UiThread
-    @NonNull
-    public ImplementationMode getImplementationMode() {
-        return mImplementationMode;
-    }
-
-    /**
-     * Applies a {@link ScaleType} to the preview.
-     *
-     * <p> This value can also be set in the layout XML file via the {@code app:scaleType}
-     * attribute.
-     *
-     * <p> The default value is {@link ScaleType#FILL_CENTER}.
-     *
-     * @param scaleType A {@link ScaleType} to apply to the preview.
-     * @attr name app:scaleType
-     */
-    @UiThread
-    public void setScaleType(@NonNull final ScaleType scaleType) {
-        mPreviewTransform.setScaleType(scaleType);
-        redrawPreview();
-    }
-
-    /**
-     * Returns the {@link ScaleType} currently applied to the preview.
-     *
-     * <p> The default value is {@link ScaleType#FILL_CENTER}.
-     *
-     * @return The {@link ScaleType} currently applied to the preview.
-     */
-    @UiThread
-    @NonNull
-    public ScaleType getScaleType() {
-        return mPreviewTransform.getScaleType();
-    }
-
-    /**
-     * Request surface asynchronously.
-     *
-     * @param surfaceRequest surface request.
-     * @return surface.
-     */
-    @UiThread
-    @NonNull
-    public ListenableFuture<Surface> requestSurfaceAsync(
-            @NonNull PreviewSurfaceRequest surfaceRequest) {
-        // TODO: API implementation
-        return surfaceRequest.getPreviewSurface().getSurface();
-    }
-
-    private void redrawPreview() {
-        if (mImplementation != null) {
-            mImplementation.redrawPreview();
-        }
-    }
-
-    /**
-     * The implementation mode of a {@link CameraPreviewView}.
-     *
-     * <p> User preference on how the {@link CameraPreviewView} should render the preview.
-     * {@link CameraPreviewView} displays the preview with either a {@link SurfaceView} or a
-     * {@link TextureView}. A {@link SurfaceView} is generally better than a {@link TextureView}
-     * when it comes to certain key metrics, including power and latency. On the other hand,
-     * {@link TextureView} is better supported by a wider range of devices. The option is used by
-     * {@link CameraPreviewView} to decide what is the best internal implementation given the device
-     * capabilities and user configurations.
-     */
-    @RequiresApi(21)
-    public enum ImplementationMode {
-
-        /**
-         * Use a {@link SurfaceView} for the preview when possible. If the device
-         * doesn't support {@link SurfaceView}, {@link CameraPreviewView} will fall back to use a
-         * {@link TextureView} instead.
-         *
-         * <p>{@link CameraPreviewView} falls back to {@link TextureView} when the API level is 24.
-         */
-        PERFORMANCE(0),
-
-        /**
-         * Use a {@link TextureView} for the preview.
-         */
-        COMPATIBLE(1);
-
-        private final int mId;
-
-        ImplementationMode(int id) {
-            mId = id;
-        }
-
-        int getId() {
-            return mId;
-        }
-
-        static ImplementationMode fromId(int id) {
-            for (ImplementationMode implementationMode : values()) {
-                if (implementationMode.mId == id) {
-                    return implementationMode;
-                }
-            }
-            throw new IllegalArgumentException("Unknown implementation mode id " + id);
-        }
-    }
-
-    /** Options for scaling the preview vis-à-vis its container {@link CameraPreviewView}. */
-    @RequiresApi(21)
-    public enum ScaleType {
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
-         * {@link CameraPreviewView}, and align it to the start of the view, which is the top left
-         * corner in a left-to-right (LTR) layout, or the top right corner in a right-to-left
-         * (RTL) layout.
-         * <p>
-         * This may cause the preview to be cropped if the camera preview aspect ratio does not
-         * match that of its container {@link CameraPreviewView}.
-         */
-        FILL_START(0),
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
-         * {@link CameraPreviewView}, and center it in the view.
-         * <p>
-         * This may cause the preview to be cropped if the camera preview aspect ratio does not
-         * match that of its container {@link CameraPreviewView}.
-         */
-        FILL_CENTER(1),
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
-         * {@link CameraPreviewView}, and align it to the end of the view, which is the bottom right
-         * corner in a left-to-right (LTR) layout, or the bottom left corner in a right-to-left
-         * (RTL) layout.
-         * <p>
-         * This may cause the preview to be cropped if the camera preview aspect ratio does not
-         * match that of its container {@link CameraPreviewView}.
-         */
-        FILL_END(2),
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
-         * within the {@link CameraPreviewView}, and align it to the start of the view, which is the
-         * top left corner in a left-to-right (LTR) layout, or the top right corner in a
-         * right-to-left (RTL) layout. The background area not covered by the preview stream
-         * will be black or the background of the {@link CameraPreviewView}
-         * <p>
-         * Both dimensions of the preview will be equal or less than the corresponding dimensions
-         * of its container {@link CameraPreviewView}.
-         */
-        FIT_START(3),
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
-         * within the {@link CameraPreviewView}, and center it inside the view. The background
-         * area not covered by the preview stream will be black or the background of the
-         * {@link CameraPreviewView}.
-         * <p>
-         * Both dimensions of the preview will be equal or less than the corresponding dimensions
-         * of its container {@link CameraPreviewView}.
-         */
-        FIT_CENTER(4),
-        /**
-         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
-         * within the {@link CameraPreviewView}, and align it to the end of the view, which is the
-         * bottom right corner in a left-to-right (LTR) layout, or the bottom left corner in a
-         * right-to-left (RTL) layout. The background area not covered by the preview stream
-         * will be black or the background of the {@link CameraPreviewView}.
-         * <p>
-         * Both dimensions of the preview will be equal or less than the corresponding dimensions
-         * of its container {@link CameraPreviewView}.
-         */
-        FIT_END(5);
-
-        private final int mId;
-
-        ScaleType(int id) {
-            mId = id;
-        }
-
-        int getId() {
-            return mId;
-        }
-
-        static ScaleType fromId(int id) {
-            for (ScaleType scaleType : values()) {
-                if (scaleType.mId == id) {
-                    return scaleType;
-                }
-            }
-            throw new IllegalArgumentException("Unknown scale type id " + id);
-        }
-    }
-}

diff --git a/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraViewFinder.java b/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraViewFinder.java
new file mode 100644
index 0000000..b780418
--- /dev/null
+++ b/camera/camera-previewview/src/main/java/androidx/camera/previewview/CameraViewFinder.java

@@ -0,0 +1,469 @@
+/*
+ * Copyright 2022 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.camera.previewview;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Looper;
+import android.util.AttributeSet;
+import android.view.Surface;
+import android.view.SurfaceView;
+import android.view.TextureView;
+import android.widget.FrameLayout;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.UiThread;
+import androidx.camera.previewview.internal.quirk.DeviceQuirks;
+import androidx.camera.previewview.internal.quirk.SurfaceViewNotCroppedByParentQuirk;
+import androidx.camera.previewview.internal.quirk.SurfaceViewStretchedQuirk;
+import androidx.camera.previewview.internal.surface.PreviewSurfaceProvider;
+import androidx.camera.previewview.internal.utils.Logger;
+import androidx.camera.previewview.internal.utils.Threads;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Base view finder that displays the camera feed for Camera2 and CameraX.
+ *
+ * <p> This class manages the preview {@link Surface}'s lifecycle. It internally uses either a
+ * {@link TextureView} or {@link SurfaceView} to display the camera feed, and applies required
+ * transformations on them to correctly display the preview, this involves correcting their
+ * aspect ratio, scale and rotation.
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public final class CameraViewFinder extends FrameLayout {
+
+    private static final String TAG = "CameraViewFinder";
+
+    @ColorRes private static final int DEFAULT_BACKGROUND_COLOR = android.R.color.black;
+    private static final ImplementationMode DEFAULT_IMPL_MODE = ImplementationMode.PERFORMANCE;
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    @NonNull
+    final PreviewTransformation mPreviewTransform = new PreviewTransformation();
+
+    @NonNull
+    private final Looper mRequiredLooper = Looper.myLooper();
+
+    @NonNull ImplementationMode mImplementationMode = DEFAULT_IMPL_MODE;
+
+    @Nullable PreviewViewImplementation mImplementation;
+    @Nullable PreviewSurfaceRequest mCurrentSurfaceRequest;
+
+    private final OnLayoutChangeListener mOnLayoutChangeListener =
+            (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+                boolean isSizeChanged =
+                        right - left != oldRight - oldLeft || bottom - top != oldBottom - oldTop;
+                if (isSizeChanged) {
+                    redrawPreview();
+                }
+            };
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    final PreviewSurfaceProvider mSurfaceProvider = new PreviewSurfaceProvider() {
+
+        @Override
+        @AnyThread
+        public void onSurfaceRequested(@NonNull PreviewSurfaceRequest surfaceRequest) {
+            if (!Threads.isMainThread()) {
+                // In short term, throwing exception to guarantee onSurfaceRequest is
+                //  called on main thread. In long term, user should be able to specify an
+                //  executor to run this function.
+                throw new IllegalStateException("onSurfaceRequested must be called on the main  "
+                        + "thread");
+            }
+            Logger.d(TAG, "Surface requested by Preview.");
+
+            mImplementation = shouldUseTextureView(
+                    surfaceRequest.isLegacyDevice(), mImplementationMode)
+                    ? new TextureViewImplementation(CameraViewFinder.this, mPreviewTransform)
+                    : new SurfaceViewImplementation(CameraViewFinder.this, mPreviewTransform);
+
+            mImplementation.onSurfaceRequested(surfaceRequest);
+
+            mPreviewTransform.setTransformationInfo(
+                    surfaceRequest.getTransformationInfo(),
+                    surfaceRequest.getResolution(),
+                    surfaceRequest.isFrontCamera());
+            redrawPreview();
+        }
+    };
+
+    @UiThread
+    public CameraViewFinder(@NonNull Context context) {
+        this(context, null);
+    }
+
+    @UiThread
+    public CameraViewFinder(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    @UiThread
+    public CameraViewFinder(@NonNull Context context,
+            @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    @UiThread
+    public CameraViewFinder(@NonNull Context context,
+            @Nullable AttributeSet attrs,
+            int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        final TypedArray attributes = context.getTheme().obtainStyledAttributes(attrs,
+                R.styleable.PreviewView, defStyleAttr, defStyleRes);
+        ViewCompat.saveAttributeDataForStyleable(this, context, R.styleable.PreviewView, attrs,
+                attributes, defStyleAttr, defStyleRes);
+
+        try {
+            final int scaleTypeId = attributes.getInteger(
+                    R.styleable.PreviewView_scaleType,
+                    mPreviewTransform.getScaleType().getId());
+            setScaleType(ScaleType.fromId(scaleTypeId));
+
+            int implementationModeId =
+                    attributes.getInteger(R.styleable.PreviewView_implementationMode,
+                            DEFAULT_IMPL_MODE.getId());
+            setImplementationMode(ImplementationMode.fromId(implementationModeId));
+        } finally {
+            attributes.recycle();
+        }
+
+        // Set background only if it wasn't already set. A default background prevents the content
+        // behind the PreviewView from being visible before the preview starts streaming.
+        if (getBackground() == null) {
+            setBackgroundColor(ContextCompat.getColor(getContext(), DEFAULT_BACKGROUND_COLOR));
+        }
+    }
+
+    /**
+     * Sets the {@link ImplementationMode} for the {@link CameraViewFinder}.
+     *
+     * <p> {@link CameraViewFinder} displays the preview with a {@link TextureView} when the
+     * mode is {@link ImplementationMode#COMPATIBLE}, and tries to use a {@link SurfaceView} if
+     * it is {@link ImplementationMode#PERFORMANCE} when possible, which depends on the device's
+     * attributes (e.g. API level). If not set, the default mode is
+     * {@link ImplementationMode#PERFORMANCE}.
+     */
+    @UiThread
+    public void setImplementationMode(@NonNull final ImplementationMode implementationMode) {
+        checkUiThread();
+        mImplementationMode = implementationMode;
+    }
+
+    /**
+     * Returns the {@link ImplementationMode}.
+     *
+     * <p> If nothing is set via {@link #setImplementationMode}, the default
+     * value is {@link ImplementationMode#PERFORMANCE}.
+     *
+     * @return The {@link ImplementationMode} for {@link CameraViewFinder}.
+     */
+    @UiThread
+    @NonNull
+    public ImplementationMode getImplementationMode() {
+        checkUiThread();
+        return mImplementationMode;
+    }
+
+    /**
+     * Applies a {@link ScaleType} to the preview.
+     *
+     * <p> This value can also be set in the layout XML file via the {@code app:scaleType}
+     * attribute.
+     *
+     * <p> The default value is {@link ScaleType#FILL_CENTER}.
+     *
+     * @param scaleType A {@link ScaleType} to apply to the preview.
+     * @attr name app:scaleType
+     */
+    @UiThread
+    public void setScaleType(@NonNull final ScaleType scaleType) {
+        checkUiThread();
+        mPreviewTransform.setScaleType(scaleType);
+        redrawPreview();
+    }
+
+    /**
+     * Returns the {@link ScaleType} currently applied to the preview.
+     *
+     * <p> The default value is {@link ScaleType#FILL_CENTER}.
+     *
+     * @return The {@link ScaleType} currently applied to the preview.
+     */
+    @UiThread
+    @NonNull
+    public ScaleType getScaleType() {
+        checkUiThread();
+        return mPreviewTransform.getScaleType();
+    }
+
+    /**
+     * Request surface asynchronously.
+     *
+     * @param surfaceRequest surface request.
+     * @return surface.
+     */
+    @UiThread
+    @NonNull
+    public ListenableFuture<Surface> requestSurfaceAsync(
+            @NonNull PreviewSurfaceRequest surfaceRequest) {
+        checkUiThread();
+
+        if (mCurrentSurfaceRequest != null
+                && surfaceRequest.equals(mCurrentSurfaceRequest)) {
+            return mCurrentSurfaceRequest.getPreviewSurface().getSurface();
+        }
+
+        if (mCurrentSurfaceRequest != null) {
+            mCurrentSurfaceRequest.markSurfaceSafeToRelease();
+        }
+
+        ListenableFuture<Surface> surfaceListenableFuture =
+                surfaceRequest.getPreviewSurface().getSurface();
+        mCurrentSurfaceRequest = surfaceRequest;
+
+        provideSurfaceIfReady();
+
+        return surfaceListenableFuture;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        addOnLayoutChangeListener(mOnLayoutChangeListener);
+        if (mImplementation != null) {
+            mImplementation.onAttachedToWindow();
+        }
+        // TODO: need to handle incomplete surface request if request is received before view
+        //  attached to window.
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        removeOnLayoutChangeListener(mOnLayoutChangeListener);
+        if (mImplementation != null) {
+            mImplementation.onDetachedFromWindow();
+        }
+        if (mCurrentSurfaceRequest != null) {
+            mCurrentSurfaceRequest.markSurfaceSafeToRelease();
+            mCurrentSurfaceRequest = null;
+        }
+    }
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    static boolean shouldUseTextureView(
+            boolean isLegacyDevice,
+            @NonNull final ImplementationMode implementationMode) {
+        boolean hasSurfaceViewQuirk = DeviceQuirks.get(SurfaceViewStretchedQuirk.class) != null
+                ||  DeviceQuirks.get(SurfaceViewNotCroppedByParentQuirk.class) != null;
+        if (Build.VERSION.SDK_INT <= 24 || isLegacyDevice || hasSurfaceViewQuirk) {
+            // Force to use TextureView when the device is running android 7.0 and below, legacy
+            // level or SurfaceView has quirks.
+            return true;
+        }
+        switch (implementationMode) {
+            case COMPATIBLE:
+                return true;
+            case PERFORMANCE:
+                return false;
+            default:
+                throw new IllegalArgumentException(
+                        "Invalid implementation mode: " + implementationMode);
+        }
+    }
+
+    // Synthetic access
+    @SuppressWarnings("WeakerAccess")
+    void redrawPreview() {
+        if (mImplementation != null) {
+            mImplementation.redrawPreview();
+        }
+    }
+
+    private boolean provideSurfaceIfReady() {
+        final PreviewSurfaceRequest surfaceRequest = mCurrentSurfaceRequest;
+        final PreviewSurfaceProvider surfaceProvider = mSurfaceProvider;
+        if (surfaceProvider != null && surfaceRequest != null) {
+            surfaceProvider.onSurfaceRequested(surfaceRequest);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the current thread is the same UI thread on which the class was constructed.
+     *
+     * @see <a href = go/android-api-guidelines/concurrency#uithread></a>
+     */
+    private void checkUiThread() {
+        // Ignore mRequiredLooper == null because this can be called from the super
+        // class constructor before the class's own constructor has run.
+        if (mRequiredLooper != null && Looper.myLooper() != mRequiredLooper) {
+            Throwable throwable = new Throwable(
+                    "A method was called on thread '" + Thread.currentThread().getName()
+                            + "'. All methods must be called on the same thread. (Expected Looper "
+                            + mRequiredLooper + ", but called on " + Looper.myLooper() + ".");
+            throw new RuntimeException(throwable);
+        }
+    }
+
+    /**
+     * The implementation mode of a {@link CameraViewFinder}.
+     *
+     * <p> User preference on how the {@link CameraViewFinder} should render the preview.
+     * {@link CameraViewFinder} displays the preview with either a {@link SurfaceView} or a
+     * {@link TextureView}. A {@link SurfaceView} is generally better than a {@link TextureView}
+     * when it comes to certain key metrics, including power and latency. On the other hand,
+     * {@link TextureView} is better supported by a wider range of devices. The option is used by
+     * {@link CameraViewFinder} to decide what is the best internal implementation given the device
+     * capabilities and user configurations.
+     */
+    @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+    public enum ImplementationMode {
+
+        /**
+         * Use a {@link SurfaceView} for the preview when possible. If the device
+         * doesn't support {@link SurfaceView}, {@link CameraViewFinder} will fall back to use a
+         * {@link TextureView} instead.
+         *
+         * <p>{@link CameraViewFinder} falls back to {@link TextureView} when the API level is 24.
+         */
+        PERFORMANCE(0),
+
+        /**
+         * Use a {@link TextureView} for the preview.
+         */
+        COMPATIBLE(1);
+
+        private final int mId;
+
+        ImplementationMode(int id) {
+            mId = id;
+        }
+
+        int getId() {
+            return mId;
+        }
+
+        static ImplementationMode fromId(int id) {
+            for (ImplementationMode implementationMode : values()) {
+                if (implementationMode.mId == id) {
+                    return implementationMode;
+                }
+            }
+            throw new IllegalArgumentException("Unknown implementation mode id " + id);
+        }
+    }
+
+    /** Options for scaling the preview vis-à-vis its container {@link CameraViewFinder}. */
+    @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+    public enum ScaleType {
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
+         * {@link CameraViewFinder}, and align it to the start of the view, which is the top left
+         * corner in a left-to-right (LTR) layout, or the top right corner in a right-to-left
+         * (RTL) layout.
+         * <p>
+         * This may cause the preview to be cropped if the camera preview aspect ratio does not
+         * match that of its container {@link CameraViewFinder}.
+         */
+        FILL_START(0),
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
+         * {@link CameraViewFinder}, and center it in the view.
+         * <p>
+         * This may cause the preview to be cropped if the camera preview aspect ratio does not
+         * match that of its container {@link CameraViewFinder}.
+         */
+        FILL_CENTER(1),
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it fills the entire
+         * {@link CameraViewFinder}, and align it to the end of the view, which is the bottom right
+         * corner in a left-to-right (LTR) layout, or the bottom left corner in a right-to-left
+         * (RTL) layout.
+         * <p>
+         * This may cause the preview to be cropped if the camera preview aspect ratio does not
+         * match that of its container {@link CameraViewFinder}.
+         */
+        FILL_END(2),
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
+         * within the {@link CameraViewFinder}, and align it to the start of the view, which is the
+         * top left corner in a left-to-right (LTR) layout, or the top right corner in a
+         * right-to-left (RTL) layout. The background area not covered by the preview stream
+         * will be black or the background of the {@link CameraViewFinder}
+         * <p>
+         * Both dimensions of the preview will be equal or less than the corresponding dimensions
+         * of its container {@link CameraViewFinder}.
+         */
+        FIT_START(3),
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
+         * within the {@link CameraViewFinder}, and center it inside the view. The background
+         * area not covered by the preview stream will be black or the background of the
+         * {@link CameraViewFinder}.
+         * <p>
+         * Both dimensions of the preview will be equal or less than the corresponding dimensions
+         * of its container {@link CameraViewFinder}.
+         */
+        FIT_CENTER(4),
+        /**
+         * Scale the preview, maintaining the source aspect ratio, so it is entirely contained
+         * within the {@link CameraViewFinder}, and align it to the end of the view, which is the
+         * bottom right corner in a left-to-right (LTR) layout, or the bottom left corner in a
+         * right-to-left (RTL) layout. The background area not covered by the preview stream
+         * will be black or the background of the {@link CameraViewFinder}.
+         * <p>
+         * Both dimensions of the preview will be equal or less than the corresponding dimensions
+         * of its container {@link CameraViewFinder}.
+         */
+        FIT_END(5);
+
+        private final int mId;
+
+        ScaleType(int id) {
+            mId = id;
+        }
+
+        int getId() {
+            return mId;
+        }
+
+        static ScaleType fromId(int id) {
+            for (ScaleType scaleType : values()) {
+                if (scaleType.mId == id) {
+                    return scaleType;
+                }
+            }
+            throw new IllegalArgumentException("Unknown scale type id " + id);
+        }
+    }
+}

diff --git a/camera/camera-previewview/src/main/java/androidx/camera/previewview/PreviewSurfaceRequest.java b/camera/camera-previewview/src/main/java/androidx/camera/previewview/PreviewSurfaceRequest.java
new file mode 100644
index 0000000..dedff4f
--- /dev/null
+++ b/camera/camera-previewview/src/main/java/androidx/camera/previewview/PreviewSurfaceRequest.java

@@ -0,0 +1,602 @@
+/*
+ * Copyright 2022 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.camera.previewview;
+
+import android.annotation.SuppressLint;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.util.Size;
+import android.view.Display;
+import android.view.Surface;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.camera.previewview.internal.surface.PreviewSurface;
+import androidx.camera.previewview.internal.transform.TransformationInfo;
+import androidx.camera.previewview.internal.utils.CameraOrientationUtil;
+import androidx.camera.previewview.internal.utils.Logger;
+import androidx.camera.previewview.internal.utils.executor.CameraExecutors;
+import androidx.camera.previewview.internal.utils.futures.FutureCallback;
+import androidx.camera.previewview.internal.utils.futures.Futures;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
+import androidx.core.util.Consumer;
+import androidx.core.util.Preconditions;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * A completable, single-use request of a {@link Surface}.
+ *
+ * <p>Contains requirements for surface characteristics along with methods for completing the
+ * request and listening for request cancellation.
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class PreviewSurfaceRequest {
+
+    private static final String TAG = "PreviewSurfaceRequest";
+
+    private final boolean mIsLegacyDevice;
+    private final boolean mIsFrontCamera;
+    @NonNull private final Size mResolution;
+    @NonNull private final PreviewSurface mInternalPreviewSurface;
+    @NonNull private final CallbackToFutureAdapter.Completer<Void> mRequestCancellationCompleter;
+    @NonNull private final ListenableFuture<Void> mSessionStatusFuture;
+    @NonNull private final CallbackToFutureAdapter.Completer<Surface> mSurfaceCompleter;
+
+    @SuppressWarnings("WeakerAccess") /*synthetic accessor */
+    @NonNull
+    final ListenableFuture<Surface> mSurfaceFuture;
+
+    @NonNull private TransformationInfo mTransformationInfo;
+
+    @SuppressWarnings("WeakerAccess") /*synthetic accessor */
+    @Nullable
+    Callback mCallback;
+
+    @Nullable private Executor mTransformationInfoExecutor;
+    @Nullable private TransformationInfoListener mTransformationInfoListener;
+
+    /**
+     * Creates a new surface request with surface resolution, view display and camera device
+     * information.
+     *
+     * @param resolution requested surface resolution.
+     * @param display view display.
+     * @param isLegacyDevice hardware level is legacy or not.
+     * @param isFrontCamera camera is front facing or not.
+     * @param sensorOrientation camera sensor orientation.
+     */
+    public PreviewSurfaceRequest(
+            @NonNull Size resolution,
+            @NonNull Display display,
+            boolean isLegacyDevice,
+            boolean isFrontCamera,
+            int sensorOrientation) {
+        super();
+        mResolution = resolution;
+        mIsLegacyDevice = isLegacyDevice;
+        mIsFrontCamera = isFrontCamera;
+        mTransformationInfo = createTransformInfo(resolution, display, isFrontCamera,
+                sensorOrientation);
+
+        // To ensure concurrency and ordering, operations are chained. Completion can only be
+        // triggered externally by the top-level completer (mSurfaceCompleter). The other future
+        // completers are only completed by callbacks set up within the constructor of this class
+        // to ensure correct ordering of events.
+
+        // Cancellation listener must be called last to ensure the result can be retrieved from
+        // the session listener.
+        String surfaceRequestString =
+                "SurfaceRequest[size: " + resolution + ", id: " + this.hashCode() + "]";
+        AtomicReference<CallbackToFutureAdapter.Completer<Void>> cancellationCompleterRef =
+                new AtomicReference<>(null);
+        ListenableFuture<Void> requestCancellationFuture =
+                CallbackToFutureAdapter.getFuture(completer -> {
+                    cancellationCompleterRef.set(completer);
+                    return surfaceRequestString + "-cancellation";
+                });
+        CallbackToFutureAdapter.Completer<Void> requestCancellationCompleter =
+                Preconditions.checkNotNull(cancellationCompleterRef.get());
+        mRequestCancellationCompleter = requestCancellationCompleter;
+
+        // Surface session status future completes and is responsible for finishing the
+        // cancellation listener.
+        AtomicReference<CallbackToFutureAdapter.Completer<Void>> sessionStatusCompleterRef =
+                new AtomicReference<>(null);
+        mSessionStatusFuture = CallbackToFutureAdapter.getFuture(completer -> {
+            sessionStatusCompleterRef.set(completer);
+            return surfaceRequestString + "-status";
+        });
+
+        Futures.addCallback(mSessionStatusFuture, new FutureCallback<Void>() {
+            @Override
+            public void onSuccess(@Nullable Void result) {
+                // Cancellation didn't occur, so complete the cancellation future. There
+                // shouldn't ever be any standard listeners on this future, so nothing should be
+                // invoked.
+                Preconditions.checkState(requestCancellationCompleter.set(null));
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                if (t instanceof RequestCancelledException) {
+                    // Cancellation occurred. Notify listeners.
+                    Preconditions.checkState(requestCancellationFuture.cancel(false));
+                } else {
+                    // Cancellation didn't occur, complete the future so cancellation listeners
+                    // are not invoked.
+                    Preconditions.checkState(requestCancellationCompleter.set(null));
+                }
+            }
+        }, CameraExecutors.directExecutor());
+
+        // Create the surface future/completer. This will be used to complete the rest of the
+        // future chain and can be set externally via SurfaceRequest methods.
+        CallbackToFutureAdapter.Completer<Void> sessionStatusCompleter =
+                Preconditions.checkNotNull(sessionStatusCompleterRef.get());
+        AtomicReference<CallbackToFutureAdapter.Completer<Surface>> surfaceCompleterRef =
+                new AtomicReference<>(null);
+        mSurfaceFuture = CallbackToFutureAdapter.getFuture(completer -> {
+            surfaceCompleterRef.set(completer);
+            return surfaceRequestString + "-Surface";
+        });
+        mSurfaceCompleter = Preconditions.checkNotNull(surfaceCompleterRef.get());
+
+        // Create the preview surface which will be used for communicating when the
+        // camera and consumer are done using the surface. Note this anonymous inner class holds
+        // an implicit reference to the PreviewSurfaceRequest. This is by design, and ensures the
+        // PreviewSurfaceRequest and all contained future completers will not be garbage collected
+        // as long as the PreviewSurface is referenced externally (via getPreviewSurface()).
+        mInternalPreviewSurface = new PreviewSurface() {
+            @SuppressLint("SyntheticAccessor")
+            @NonNull
+            @Override
+            protected ListenableFuture<Surface> provideSurfaceAsync() {
+                Logger.d(TAG,
+                        "mInternalPreviewSurface + " + mInternalPreviewSurface + " "
+                                + "provideSurface");
+                return mSurfaceFuture;
+            }
+        };
+        ListenableFuture<Void> terminationFuture = mInternalPreviewSurface.getTerminationFuture();
+
+        // Propagate surface completion to the session future.
+        Futures.addCallback(mSurfaceFuture, new FutureCallback<Surface>() {
+            @Override
+            public void onSuccess(@Nullable Surface surface) {
+                // On successful setting of a surface, defer completion of the session future to
+                // the PreviewSurface termination future. Once that future completes, then it
+                // is safe to release the Surface and associated resources.
+
+                Futures.propagate(terminationFuture, sessionStatusCompleter);
+                if (mCallback != null) {
+                    mCallback.onSuccess(surface);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Throwable t) {
+                // Translate cancellation into a SurfaceRequestCancelledException. Other
+                // exceptions mean either the request was completed via willNotProvideSurface() or a
+                // programming error occurred. In either case, the user will never see the
+                // session future (an immediate future will be returned instead), so complete the
+                // future so cancellation listeners are never called.
+                if (t instanceof CancellationException) {
+                    Preconditions.checkState(sessionStatusCompleter.setException(
+                            new RequestCancelledException(
+                                    surfaceRequestString + " cancelled.", t)));
+                } else {
+                    sessionStatusCompleter.set(null);
+                }
+                if (mCallback != null) {
+                    mCallback.onFailure(t);
+                }
+            }
+        }, CameraExecutors.directExecutor());
+
+        // If the preview surface is terminated, there are two cases:
+        // 1. The surface has not yet been provided to the camera (or marked as 'will not
+        //    complete'). Treat this as if the surface request has been cancelled.
+        // 2. The surface was already provided to the camera. In this case the camera is now
+        //    finished with the surface, so cancelling the surface future below will be a no-op.
+        terminationFuture.addListener(() -> {
+            Logger.d(TAG,
+                    "mInternalPreviewSurface + " + mInternalPreviewSurface + " "
+                            + "terminateFuture triggered");
+            mSurfaceFuture.cancel(true);
+        }, CameraExecutors.directExecutor());
+    }
+
+    /**
+     * Returns the resolution of the requested {@link Surface}.
+     *
+     * The surface which fulfills this request must have the resolution specified here in
+     * order to fulfill the resource requirements of the camera.
+     *
+     * @return The guaranteed supported resolution.
+     * @see SurfaceTexture#setDefaultBufferSize(int, int)
+     */
+    @NonNull
+    public Size getResolution() {
+        return mResolution;
+    }
+
+    /**
+     * Returns the status of camera lens facing.
+     *
+     * @return true if front camera, otherwise false.
+     */
+    public boolean isFrontCamera() {
+        return mIsFrontCamera;
+    }
+
+    /**
+     * Returns the status of camera hardware level.
+     *
+     * @return true if legacy device, otherwise false.
+     */
+    public boolean isLegacyDevice() {
+        return mIsLegacyDevice;
+    }
+
+    /**
+     * Set surface request callback.
+     *
+     * @param callback {@link Callback}.
+     */
+    @SuppressLint("ExecutorRegistration")
+    public void setCallback(@NonNull Callback callback) {
+        mCallback = callback;
+    }
+
+    /**
+     * Clear surface request callback.
+     */
+    public void clearCallback() {
+        mCallback = null;
+    }
+
+    /**
+     * Closes the preview surface to mark it as safe to release.
+     */
+    public void markSurfaceSafeToRelease() {
+        mInternalPreviewSurface.close();
+    }
+
+    @NonNull
+    TransformationInfo getTransformationInfo() {
+        return mTransformationInfo;
+    }
+
+    @NonNull
+    PreviewSurface getPreviewSurface() {
+        return mInternalPreviewSurface;
+    }
+
+    @SuppressLint("PairedRegistration")
+    void addRequestCancellationListener(@NonNull Executor executor,
+            @NonNull Runnable listener) {
+        mRequestCancellationCompleter.addCancellationListener(listener, executor);
+    }
+
+    /**
+     * Completes the request for a {@link Surface} if it has not already been
+     * completed or cancelled.
+     *
+     * <p>Once the camera no longer needs the provided surface, the {@code resultListener} will be
+     * invoked with a {@link Result} containing {@link Result#RESULT_SURFACE_USED_SUCCESSFULLY}.
+     * At this point it is safe to release the surface and any underlying resources. Releasing
+     * the surface before receiving this signal may cause undesired behavior on lower API levels.
+     *
+     * <p>If the request is cancelled by the camera before successfully attaching the
+     * provided surface to the camera, then the {@code resultListener} will be invoked with a
+     * {@link Result} containing {@link Result#RESULT_REQUEST_CANCELLED}.
+     *
+     * <p>If the request was previously completed via {@link #willNotProvideSurface()}, then
+     * {@code resultListener} will be invoked with a {@link Result} containing
+     * {@link Result#RESULT_WILL_NOT_PROVIDE_SURFACE}.
+     *
+     * <p>Upon returning from this method, the surface request is guaranteed to be complete.
+     * However, only the {@code resultListener} provided to the first invocation of this method
+     * should be used to track when the provided {@link Surface} is no longer in use by the
+     * camera, as subsequent invocations will always invoke the {@code resultListener} with a
+     * {@link Result} containing {@link Result#RESULT_SURFACE_ALREADY_PROVIDED}.
+     *
+     * @param surface        The surface which will complete the request.
+     * @param executor       Executor used to execute the {@code resultListener}.
+     * @param resultListener Listener used to track how the surface is used by the camera in
+     *                       response to being provided by this method.
+     *
+     */
+    void provideSurface(
+            @NonNull Surface surface,
+            @NonNull Executor executor,
+            @NonNull Consumer<Result> resultListener) {
+        if (mSurfaceCompleter.set(surface) || mSurfaceFuture.isCancelled()) {
+            // Session will be pending completion (or surface request was cancelled). Return the
+            // session future.
+            Futures.addCallback(mSessionStatusFuture, new FutureCallback<Void>() {
+                @Override
+                public void onSuccess(@Nullable Void result) {
+                    resultListener.accept(Result.of(Result.RESULT_SURFACE_USED_SUCCESSFULLY,
+                            surface));
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    Preconditions.checkState(t instanceof RequestCancelledException, "Camera "
+                            + "surface session should only fail with request "
+                            + "cancellation. Instead failed due to:\n" + t);
+                    resultListener.accept(Result.of(Result.RESULT_REQUEST_CANCELLED, surface));
+                }
+            }, executor);
+        } else {
+            // Surface request is already complete
+            Preconditions.checkState(mSurfaceFuture.isDone());
+            try {
+                mSurfaceFuture.get();
+                // Getting this far means the surface was already provided.
+                executor.execute(
+                        () -> resultListener.accept(
+                                Result.of(Result.RESULT_SURFACE_ALREADY_PROVIDED, surface)));
+            } catch (InterruptedException | ExecutionException e) {
+                executor.execute(
+                        () -> resultListener.accept(
+                                Result.of(Result.RESULT_WILL_NOT_PROVIDE_SURFACE, surface)));
+            }
+        }
+    }
+
+    /**
+     * Signals that the request will never be fulfilled.
+     *
+     * <p>This may be called in the case where the application may be shutting down and a
+     * surface will never be produced to fulfill the request.
+     *
+     * <p>This will be called by CameraPreviewView as soon as it is known that the request will not
+     * be fulfilled. Failure to complete the SurfaceRequest via {@code willNotProvideSurface()}
+     * or {@link #provideSurface(Surface, Executor, Consumer)} may cause long delays in shutting
+     * down the camera.
+     *
+     * <p>Upon returning from this method, the request is guaranteed to be complete, regardless
+     * of the return value. If the request was previously successfully completed by
+     * {@link #provideSurface(Surface, Executor, Consumer)}, invoking this method will return
+     * {@code false}, and will have no effect on how the surface is used by the camera.
+     *
+     * @return {@code true} if this call to {@code willNotProvideSurface()} successfully
+     * completes the request, i.e., the request has not already been completed via
+     * {@link #provideSurface(Surface, Executor, Consumer)} or by a previous call to
+     * {@code willNotProvideSurface()} and has not already been cancelled by the camera.
+     *
+     */
+    boolean willNotProvideSurface() {
+        return mSurfaceCompleter.setException(
+                new PreviewSurface.SurfaceUnavailableException("Surface request "
+                        + "will not complete."));
+    }
+
+    void setTransformationInfoListener(@NonNull Executor executor,
+            @NonNull TransformationInfoListener listener) {
+        mTransformationInfoListener = listener;
+        mTransformationInfoExecutor = executor;
+        TransformationInfo transformationInfo = mTransformationInfo;
+        if (transformationInfo != null) {
+            executor.execute(() -> listener.onTransformationInfoUpdate(
+                    transformationInfo));
+        }
+    }
+
+    void updateTransformationInfo(@NonNull TransformationInfo transformationInfo) {
+        mTransformationInfo = transformationInfo;
+        TransformationInfoListener listener = mTransformationInfoListener;
+        if (listener != null && mTransformationInfoExecutor != null) {
+            mTransformationInfoExecutor.execute(
+                    () -> listener.onTransformationInfoUpdate(
+                            transformationInfo));
+        }
+    }
+
+    @NonNull
+    private static TransformationInfo createTransformInfo(
+            @NonNull Size surfaceResolution,
+            @NonNull Display display,
+            boolean isFrontCamera,
+            int sensorOrientation) {
+        // For Camera2, cropRect is equal to full size of surface and targetRotation is default
+        // display rotation.
+        // For CameraX, targetRotation can be set by the user.
+        Rect cropRect = new Rect(0, 0,
+                surfaceResolution.getWidth(), surfaceResolution.getHeight());
+        // TODO: verify the preview working correctly when not in a locked portrait orientation,
+        //  for both the PERFORMANCE and the COMPATIBLE mode
+        int relativeRotationDegrees =
+                CameraOrientationUtil.surfaceRotationToDegrees(display.getRotation());
+        return TransformationInfo.of(cropRect,
+                CameraOrientationUtil.getRelativeImageRotation(
+                        relativeRotationDegrees,
+                        sensorOrientation,
+                        !isFrontCamera),
+                display.getRotation());
+    }
+
+    static final class RequestCancelledException extends RuntimeException {
+        RequestCancelledException(@NonNull String message, @NonNull Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    interface TransformationInfoListener {
+
+        /**
+         * Callback for transformation info update.
+         * @param transformationInfo transformation info.
+         */
+        void onTransformationInfoUpdate(@NonNull TransformationInfo transformationInfo);
+    }
+
+    /**
+     * Result of providing a surface to a {@link PreviewSurfaceRequest} via
+     * {@link #provideSurface(Surface, Executor, Consumer)}.
+     *
+     */
+    @AutoValue
+    abstract static class Result {
+
+        /**
+         * Possible result codes.
+         *
+         * @hide
+         */
+        @IntDef({RESULT_SURFACE_USED_SUCCESSFULLY, RESULT_REQUEST_CANCELLED, RESULT_INVALID_SURFACE,
+                RESULT_SURFACE_ALREADY_PROVIDED, RESULT_WILL_NOT_PROVIDE_SURFACE})
+        @Retention(RetentionPolicy.SOURCE)
+        @RestrictTo(Scope.LIBRARY)
+        public @interface ResultCode {
+        }
+
+        /**
+         * Provided surface was successfully used by the camera and eventually detached once no
+         * longer needed by the camera.
+         *
+         * <p>This result denotes that it is safe to release the {@link Surface} and any underlying
+         * resources.
+         *
+         * <p>For compatibility reasons, the {@link Surface} object should not be reused by
+         * future {@link PreviewSurfaceRequest SurfaceRequests}, and a new surface should be
+         * created instead.
+         */
+        public static final int RESULT_SURFACE_USED_SUCCESSFULLY = 0;
+
+        /**
+         * Provided surface was never attached to the camera due to the
+         * {@link PreviewSurfaceRequest} being cancelled by the camera.
+         *
+         * <p>It is safe to release or reuse {@link Surface}, assuming it was not previously
+         * attached to a camera via {@link #provideSurface(Surface, Executor, Consumer)}. If
+         * reusing the surface for a future surface request, it should be verified that the
+         * surface still matches the resolution specified by
+         * {@link PreviewSurfaceRequest#getResolution()}.
+         */
+        public static final int RESULT_REQUEST_CANCELLED = 1;
+
+        /**
+         * Provided surface could not be used by the camera.
+         *
+         * <p>This is likely due to the {@link Surface} being closed prematurely or the resolution
+         * of the surface not matching the resolution specified by
+         * {@link PreviewSurfaceRequest#getResolution()}.
+         */
+        public static final int RESULT_INVALID_SURFACE = 2;
+
+        /**
+         * Surface was not attached to the camera through this invocation of
+         * {@link #provideSurface(Surface, Executor, Consumer)} due to the {@link PreviewSurfaceRequest}
+         * already being complete with a surface.
+         *
+         * <p>The {@link PreviewSurfaceRequest} has already been completed by a previous invocation
+         * of {@link #provideSurface(Surface, Executor, Consumer)}.
+         *
+         * <p>It is safe to release or reuse the {@link Surface}, assuming it was not previously
+         * attached to a camera via {@link #provideSurface(Surface, Executor, Consumer)}.
+         */
+        public static final int RESULT_SURFACE_ALREADY_PROVIDED = 3;
+
+        /**
+         * Surface was not attached to the camera through this invocation of
+         * {@link #provideSurface(Surface, Executor, Consumer)} due to the
+         * {@link PreviewSurfaceRequest} already being marked as "will not provide surface".
+         *
+         * <p>The {@link PreviewSurfaceRequest} has already been marked as 'will not provide
+         * surface' by a previous invocation of {@link #willNotProvideSurface()}.
+         *
+         * <p>It is safe to release or reuse the {@link Surface}, assuming it was not previously
+         * attached to a camera via {@link #provideSurface(Surface, Executor, Consumer)}.
+         */
+        public static final int RESULT_WILL_NOT_PROVIDE_SURFACE = 4;
+
+        /**
+         * Creates a result from the given result code and surface.
+         *
+         * <p>Can be used to compare to results returned to {@code resultListener} in
+         * {@link #provideSurface(Surface, Executor, Consumer)}.
+         *
+         * @param code    One of {@link #RESULT_SURFACE_USED_SUCCESSFULLY},
+         *                {@link #RESULT_REQUEST_CANCELLED}, {@link #RESULT_INVALID_SURFACE},
+         *                {@link #RESULT_SURFACE_ALREADY_PROVIDED}, or
+         *                {@link #RESULT_WILL_NOT_PROVIDE_SURFACE}.
+         * @param surface The {@link Surface} used to complete the {@link PreviewSurfaceRequest}.
+         */
+        @NonNull
+        static Result of(@ResultCode int code, @NonNull Surface surface) {
+            return new AutoValue_PreviewSurfaceRequest_Result(code, surface);
+        }
+
+        /**
+         * Returns the result of invoking {@link #provideSurface(Surface, Executor, Consumer)}
+         * with the surface from {@link #getSurface()}.
+         *
+         * @return One of {@link #RESULT_SURFACE_USED_SUCCESSFULLY},
+         * {@link #RESULT_REQUEST_CANCELLED}, {@link #RESULT_INVALID_SURFACE}, or
+         * {@link #RESULT_SURFACE_ALREADY_PROVIDED}, {@link #RESULT_WILL_NOT_PROVIDE_SURFACE}.
+         */
+        @ResultCode
+        public abstract int getResultCode();
+
+        /**
+         * The surface used to complete a {@link PreviewSurfaceRequest} with
+         * {@link #provideSurface(Surface, Executor, Consumer)}.
+         *
+         * @return the surface.
+         */
+        @NonNull
+        public abstract Surface getSurface();
+
+        // Ensure Result can't be subclassed outside the package
+        Result() {
+        }
+    }
+
+    /**
+     * Callback for surface request.
+     */
+    public interface Callback {
+
+        /**
+         * Callback for success.
+         * @param surface surface.
+         */
+        void onSuccess(@Nullable Surface surface);
+
+        /**
+         * Callback for failure.
+         * @param t throwable.
+         */
+        void onFailure(@NonNull Throwable t);
+    }
+}