diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 6453458e9b4..c162fc46b5b 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -19,7 +19,7 @@
 <!-- Things unrelated to preference framework UI customization should go to other styles files -->
 <resources>
 
-    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+    <style name="SettingsPreferenceTheme" parent="@style/PreferenceTheme.SettingsBase">
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
         <item name="cardPreferenceStyle">@style/CardPreference</item>
         <item name="slicePreferenceStyle">@style/SlicePreference</item>
@@ -28,7 +28,7 @@
         <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
     </style>
 
-    <style name="PreferenceTheme.SetupWizard">
+    <style name="PreferenceTheme.SetupWizard" parent="@style/SettingsPreferenceTheme">
         <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
         <item name="preferenceStyle">@style/Preference.Material</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4df4a78f31e..444ec72e9f1 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -26,6 +26,7 @@
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="android:clipToPadding">false</item>
         <item name="android:clipChildren">false</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
         <item name="android:listPreferredItemHeight">72dip</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -207,7 +208,7 @@
     <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
         <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
 
         <!-- action bar, needed for search bar icon tinting -->
         <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index b286a518c6d..deed9c63863 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -196,7 +196,7 @@
         <item name="android:colorPrimary">@color/material_grey_100</item>
         <item name="android:colorAccent">@color/material_blue_700</item>
         <item name="android:titleTextColor">@color/material_blue_700</item>
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
     </style>
 
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index 92edb17b503..0fe63284510 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -13,7 +13,7 @@
         <item name="colorPrimary">#ffffff</item>
         <item name="colorPrimaryDark">#ffffff</item>
         <item name="colorAccent">#ffffff</item>
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
         <item name="android:windowLightStatusBar">true</item>
         <!-- Define this color for material design -->
         <item name="colorPrimaryVariant">@android:color/white</item>
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 771a86359ff..c4f55808870 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -73,6 +73,9 @@ public class ScreenTimeoutSettingsTest {
     @Mock
     AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
 
+    @Mock
+    AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
+
     @Mock
     Preference mDisableOptionsPreference;
 
@@ -98,6 +101,8 @@ public class ScreenTimeoutSettingsTest {
 
         mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;
         mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
+        mSettings.mAdaptiveSleepCameraStatePreferenceController =
+                mAdaptiveSleepCameraStatePreferenceController;
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
index 730489795fe..6d4a6bbd4d8 100644
--- a/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
@@ -37,7 +37,7 @@ public class CardPreferenceTest {
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mContext.setTheme(R.style.PreferenceTheme);
+        mContext.setTheme(R.style.SettingsPreferenceTheme);
         mCardPreference = new CardPreference(mContext);
     }