diff --git a/apps/parent/build.gradle b/apps/parent/build.gradle
index 0b690e9c05..9fc4e6d9ee 100644
--- a/apps/parent/build.gradle
+++ b/apps/parent/build.gradle
@@ -36,7 +36,7 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 22
+        versionCode = 23
         versionName = "2.0.5"
 
         multiDexEnabled = true
diff --git a/apps/parent/src/main/AndroidManifest.xml b/apps/parent/src/main/AndroidManifest.xml
index 326a8d158c..8b33a642c4 100644
--- a/apps/parent/src/main/AndroidManifest.xml
+++ b/apps/parent/src/main/AndroidManifest.xml
@@ -26,6 +26,8 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+
     <application
         android:name=".util.ApplicationManager"
         android:allowBackup="false"
diff --git a/apps/student/src/main/AndroidManifest.xml b/apps/student/src/main/AndroidManifest.xml
index 155f469d2a..392ed5f2bb 100644
--- a/apps/student/src/main/AndroidManifest.xml
+++ b/apps/student/src/main/AndroidManifest.xml
@@ -46,8 +46,8 @@
         android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
         android:targetPackage="com.instructure.candroid"/>
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" tools:replace="required"/>
 
     <supports-screens
         android:anyDensity="true"
diff --git a/apps/teacher/src/main/AndroidManifest.xml b/apps/teacher/src/main/AndroidManifest.xml
index c776547a42..eb1d4651e5 100644
--- a/apps/teacher/src/main/AndroidManifest.xml
+++ b/apps/teacher/src/main/AndroidManifest.xml
@@ -24,8 +24,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- For Studio -->
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" tools:replace="required"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" tools:replace="required"/>
 
     <supports-screens
         android:anyDensity="true"