diff --git a/packages/camera/camera/android/build.gradle b/packages/camera/camera/android/build.gradle
index 633efd0b284a..25285ad33205 100644
--- a/packages/camera/camera/android/build.gradle
+++ b/packages/camera/camera/android/build.gradle
@@ -1,6 +1,6 @@
 group 'io.flutter.plugins.camera'
 version '1.0-SNAPSHOT'
-def args = ["-Xlint:deprecation","-Xlint:unchecked","-Werror"]
+def args = ["-Xlint:deprecation","-Xlint:unchecked"]
 
 buildscript {
     repositories {
diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md
index db12fd1829aa..9b9bf42af31b 100644
--- a/packages/shared_preferences/shared_preferences/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.9
+
+* SharedPreferences mock is detectable
+
 ## 2.0.8
 
 * Update minimum Flutter SDK to 2.5 and iOS deployment target to 9.0.
diff --git a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart
index 841d615262de..385b2594bffa 100644
--- a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart
+++ b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart
@@ -212,4 +212,15 @@ class SharedPreferences {
         InMemorySharedPreferencesStore.withData(newValues);
     _completer = null;
   }
+
+  /// reports if this instance is mocked
+  ///
+  /// An instance turns to being mocked after a call to [setMockInitialValues]
+  ///
+  /// true if changes on the current delegate will not write to the disk
+  /// false if shared preferences behaves as normal
+  @visibleForTesting
+  bool isMocked() {
+    return _store is InMemorySharedPreferencesStore;
+  }
 }
diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml
index 1e59edf1e12e..1ef9cf1d7fc8 100644
--- a/packages/shared_preferences/shared_preferences/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for reading and writing simple key-value pairs.
   Wraps NSUserDefaults on iOS and SharedPreferences on Android.
 repository: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
-version: 2.0.8
+version: 2.0.9
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
diff --git a/script/tool/lib/src/create_all_plugins_app_command.dart b/script/tool/lib/src/create_all_plugins_app_command.dart
index 6dbebf2f5c74..5d9b4ed9c728 100644
--- a/script/tool/lib/src/create_all_plugins_app_command.dart
+++ b/script/tool/lib/src/create_all_plugins_app_command.dart
@@ -93,10 +93,13 @@ class CreateAllPluginsAppCommand extends PluginCommand {
 
     final StringBuffer newGradle = StringBuffer();
     for (final String line in gradleFile.readAsLinesSync()) {
-      if (line.contains('minSdkVersion 16')) {
-        // Android SDK 20 is required by Google maps.
-        // Android SDK 19 is required by WebView.
+      if (line.contains('minSdkVersion')) {
+        // minSdkVersion 20 is required by Google maps.
+        // minSdkVersion 19 is required by WebView.
         newGradle.writeln('minSdkVersion 20');
+      } else if (line.contains('compileSdkVersion')) {
+        // compileSdkVersion 31 is required by Camera.
+        newGradle.writeln('compileSdkVersion 31');
       } else {
         newGradle.writeln(line);
       }