diff --git a/app/src/main/res/layout-land/resume_lesson_fragment.xml b/app/src/main/res/layout-land/resume_lesson_fragment.xml
index e317a2eff27..ab5f816d7d2 100644
--- a/app/src/main/res/layout-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-land/resume_lesson_fragment.xml
@@ -94,7 +94,7 @@
           android:layout_width="wrap_content"
           android:layout_height="match_parent"
           android:background="@drawable/state_button_primary_background"
-          android:drawableTint="@color/component_color_shared_white_background_color"
+          app:drawableTint="@color/component_color_shared_white_background_color"
           android:fontFamily="sans-serif-medium"
           android:gravity="center"
           android:minWidth="144dp"
diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
index 5997f1069a4..6d803c68388 100644
--- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
@@ -124,7 +124,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@drawable/state_button_primary_background"
-            android:drawableTint="@color/component_color_shared_white_background_color"
+            app:drawableTint="@color/component_color_shared_white_background_color"
             android:fontFamily="sans-serif-medium"
             android:gravity="center"
             android:minWidth="144dp"
diff --git a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
index fe98ab51455..9e0c7ad8408 100644
--- a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
+++ b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
@@ -15,7 +15,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawablePadding="8dp"
-      android:drawableTint="@color/component_color_shared_multipane_icon_color"
+      app:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
       android:text="@string/menu_options"
@@ -28,7 +28,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawablePadding="8dp"
-      android:drawableTint="@color/component_color_shared_multipane_icon_color"
+      app:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
       android:text="@string/menu_help"
@@ -41,7 +41,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawablePadding="8dp"
-      android:drawableTint="@color/component_color_shared_multipane_icon_color"
+      app:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
       android:text="@string/bottom_sheet_options_menu_close"
diff --git a/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml b/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
index c0f63136ec5..4d5161fb530 100644
--- a/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
+++ b/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!-- TODO(#59): Make this layout only accessible to tests. -->
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -20,6 +21,7 @@
       android:layout_height="wrap_content"
       android:max="@{viewModel.defaultMaximum}"
       android:min="@{viewModel.defaultMinimum}"
+      tools:targetApi="26"
       app:animatedProgress="@{viewModel.currentAutoProgress}" />
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -27,6 +29,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:max="@{viewModel.defaultMaximum}"
-      android:min="@{viewModel.defaultMinimum}" />
+      android:min="@{viewModel.defaultMinimum}"
+      tools:targetApi="26"/>
   </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
index 09b1eb682ce..a29a44814fe 100644
--- a/app/src/main/res/layout/content_item.xml
+++ b/app/src/main/res/layout/content_item.xml
@@ -1,5 +1,6 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -44,6 +45,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:breakStrategy="simple"
+      tools:targetApi="23"
       android:fontFamily="sans-serif"
       android:minWidth="48dp"
       android:minHeight="48dp"
diff --git a/app/src/main/res/layout/feedback_item.xml b/app/src/main/res/layout/feedback_item.xml
index f87b4d316b0..4bc646346bc 100644
--- a/app/src/main/res/layout/feedback_item.xml
+++ b/app/src/main/res/layout/feedback_item.xml
@@ -1,5 +1,6 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -44,6 +45,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:breakStrategy="simple"
+      tools:targetApi="23"
       android:fontFamily="sans-serif"
       android:minWidth="48dp"
       android:minHeight="48dp"
diff --git a/app/src/main/res/layout/profile_list_control_buttons.xml b/app/src/main/res/layout/profile_list_control_buttons.xml
index fa3809a5b29..ac6a92b7e05 100644
--- a/app/src/main/res/layout/profile_list_control_buttons.xml
+++ b/app/src/main/res/layout/profile_list_control_buttons.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -52,6 +53,7 @@
       android:layout_height="wrap_content"
       android:max="@{viewModel.forceUploadProgress.totalEventsToUpload}"
       android:min="0"
+      tools:targetApi="26"
       app:animatedProgress="@{viewModel.forceUploadProgress.eventsUploaded}"
       android:visibility="@{viewModel.forceUploadProgress.hasEventsToUpload() ? View.VISIBLE : View.GONE, default=gone}"
       app:layout_constraintBottom_toBottomOf="@+id/learner_analytics_upload_logs_now_button"
diff --git a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml
index 5730c5b283e..9c5602c9f26 100755
--- a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml
+++ b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -38,6 +39,7 @@
         app:entityId="@{viewModel.promotedStory.storyId}"
         app:entityType="@{viewModel.entityType}"
         android:forceDarkAllowed="false"
+        tools:targetApi="29"
         app:layout_constraintDimensionRatio="4:3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/promoted_story_card.xml b/app/src/main/res/layout/promoted_story_card.xml
index 91e711e0dae..84f2062cd9c 100755
--- a/app/src/main/res/layout/promoted_story_card.xml
+++ b/app/src/main/res/layout/promoted_story_card.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -36,6 +37,7 @@
         app:entityId="@{viewModel.promotedStory.storyId}"
         app:entityType="@{viewModel.entityType}"
         android:forceDarkAllowed="false"
+        tools:targetApi="29"
         app:layout_constraintDimensionRatio="H, 16:9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/recently_played_story_card.xml b/app/src/main/res/layout/recently_played_story_card.xml
index 0994de8f994..d177628db8f 100755
--- a/app/src/main/res/layout/recently_played_story_card.xml
+++ b/app/src/main/res/layout/recently_played_story_card.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -39,6 +40,7 @@
         app:entityId="@{viewModel.promotedStory.storyId}"
         app:entityType="@{viewModel.entityType}"
         android:forceDarkAllowed="false"
+        tools:targetApi="29"
         app:layout_constraintDimensionRatio="4:3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"