Merge branch 'develop' into update-pr-4383

.github/CODEOWNERS

@@ -50,9 +50,6 @@ gradlew.bat @BenHenning
 # Devbots configurations.
 /.devbots/ @BenHenning
 
-# All tests.
-*Test.kt @anandwana001
-
 # All resource files.
 /app/src/main/res/**/*.xml @rt4914
 /utility/src/main/res/**/*.xml @rt4914
@@ -72,7 +69,7 @@ gradlew.bat @BenHenning
 *Manifest.xml @BenHenning
 
 # Linter configuration.
-buf.yaml @anandwana001
+buf.yaml @BenHenning
 
 # Third-party dependencies.
 /third_party/ @BenHenning
@@ -108,8 +105,8 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 #####################################################################################
 
 # Global app module code ownership.
-/app/**/*.kt @rt4914
-/app/**/*.java @rt4914
+/app/**/*.kt @rt4914 @BenHenning
+/app/**/*.java @rt4914 @BenHenning
 
 # State players.
 /app/src/*/java/org/oppia/android/app/player/ @BenHenning
@@ -128,8 +125,8 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 # Databinding adapters.
 /app/src/main/java/org/oppia/android/app/databinding/ @BenHenning
 
-# App deprecation functionality.
-/app/src/*/java/org/oppia/android/app/deprecation/ @BenHenning
+# App notices functionality (such as for deprecations).
+/app/src/*/java/org/oppia/android/app/notice/ @BenHenning
 
 # Parsing functionality needed for interactions.
 /app/src/*/java/org/oppia/android/app/parser/ @BenHenning
@@ -144,7 +141,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 /app/src/*/java/org/oppia/android/app/viewmodel/ @BenHenning
 
 # App testing infrastructure.
-/app/src/*/java/org/oppia/android/app/testing/ @anandwana001
+/app/src/*/java/org/oppia/android/app/testing/ @BenHenning
 
 #####################################################################################
 #                                  domain module                                    #
@@ -153,9 +150,6 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 # Global domain module code ownership.
 /domain/**/*.kt @BenHenning
 
-# Domain test resources.
-/domain/src/test/res/values/strings.xml @BenHenning
-
 # Questions support.
 /domain/src/*/java/org/oppia/android/domain/question/ @BenHenning
 
@@ -167,7 +161,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 #####################################################################################
 
 # Global testing module code ownership.
-/testing/**/*.kt @anandwana001 @BenHenning
+/testing/**/*.kt @BenHenning
 
 #####################################################################################
 #                                    data module                                    #
@@ -184,14 +178,17 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 # Global utility module code ownership.
 /utility/**/*.kt @BenHenning
 
+# Utility test resources.
+/utility/src/test/res/values/strings.xml @BenHenning
+
 # Accessibility utilities.
-/utility/src/*/java/org/oppia/android/util/accessibility/ @rt4914
+/utility/src/*/java/org/oppia/android/util/accessibility/ @rt4914 @BenHenning
 
 # Core logging infrastructure.
 /utility/src/*/java/org/oppia/android/util/logging/ @BenHenning
 
 # Miscellaneous statusbar UI utilities.
-/utility/src/*/java/org/oppia/android/util/statusbar/ @rt4914
+/utility/src/*/java/org/oppia/android/util/statusbar/ @rt4914 @BenHenning
 
 #####################################################################################
 #                                     scripts                                       #
@@ -200,9 +197,6 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 # Global scripts code ownership.
 /scripts/ @BenHenning
 
-# Shell file ownership.
-/scripts/**/*.sh @anandwana001 @BenHenning
-
 # Script proto ownership.
 /scripts/**/*.proto @BenHenning
 
@@ -225,7 +219,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 #####################################################################################
 
 # End-to-end test utilities and modules.
-/instrumentation/src/java/**/*.kt @anandwana001 @BenHenning
+/instrumentation/**/*.kt @BenHenning
 
 #####################################################################################
 #                                global overrides                                   #