diff --git a/src/main/res/xml/device_policy_header.xml b/src/main/res/xml/device_policy_header.xml
index 96e294b8..2862985f 100644
--- a/src/main/res/xml/device_policy_header.xml
+++ b/src/main/res/xml/device_policy_header.xml
@@ -100,6 +100,7 @@
         <com.afwsamples.testdpc.common.preference.DpcPreference
             android:key="cross_profile_calendar"
             android:title="@string/cross_profile_calendar"
+            testdpc:admin="orgOwnedProfileOwner|profileOwner"
             testdpc:minSdkVersion="Q" />
     </PreferenceCategory>
 
@@ -346,7 +347,7 @@
             android:key="enable_wifi_config_lockdown"
             android:title="@string/enable_wifi_config_lockdown"
             testdpc:admin="deviceOwner|orgOwnedProfileOwner"
-            testdpc:minSdkVersion="M" />
+            testdpc:minSdkVersion="R" />
         <com.afwsamples.testdpc.common.preference.DpcPreference
             android:key="modify_wifi_configuration"
             android:title="@string/modify_wifi_configuration"