diff --git a/res/values/strings.xml b/res/values/strings.xml
index 091b3af..a72794d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10178,8 +10178,7 @@
     <!-- Label explaining that the app installed by credit provider can be uninstalled. [CHAR LIMIT=60]-->
     <string name="financed_privacy_uninstall_creditor_app">You can uninstall the creditor app</string>
     <!-- Title of setting on security settings screen on a device provisioned by Device Lock. This will take the user to a screen in Device Lock with information about what a device provider can control and their impact on the user's privacy. Shown on Device Lock provisioned devices only. [CHAR LIMIT=NONE] -->
-    <!-- TODO(b/282040794): Update the title -->
-    <string name="device_lock_info">Device Lock</string>
+    <string name="financed_device_info">Financed device info</string>
     <!-- Strings for displaying which applications were set as default for specific actions. -->
     <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->
     <string name="default_camera_app_title">{count, plural,
diff --git a/res/values/themes.xml b/res/values/themes.xml
index eeba1c7..e3c1b20 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -132,6 +132,8 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:clipToPadding">true</item>
         <item name="android:clipChildren">true</item>
+        <item name="android:textDirection">locale</item>
+        <item name="android:layoutDirection">locale</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Widget.ActionBar</item>
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index 1a9d788..47ea3e0 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -147,8 +147,8 @@
             settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
 
         <Preference
-            android:key="device_lock_info"
-            android:title="@string/device_lock_info"
+            android:key="financed_device_info"
+            android:title="@string/financed_device_info"
             android:summary="@string/summary_placeholder"
             settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">
             <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index 8223f50..f52fb12 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -59,8 +59,8 @@
             settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
 
         <Preference
-            android:key="device_lock_info"
-            android:title="@string/device_lock_info"
+            android:key="financed_device_info"
+            android:title="@string/financed_device_info"
             android:summary="@string/summary_placeholder"
             settings:controller="com.android.settings.devicelock.DeviceLockPreferenceController">
             <intent android:action="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
index b75fa8c..c54b750 100644
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -190,6 +190,7 @@
         when(mockUsbPort.getStatus()).thenReturn(mockUsbPortStatus);
         when(mockUsbPort.supportsComplianceWarnings()).thenReturn(true);
         when(mockUsbPortStatus.isConnected()).thenReturn(true);
-        when(mockUsbPortStatus.getComplianceWarnings()).thenReturn(new int[]{1});
+        when(mockUsbPortStatus.getComplianceWarnings())
+                .thenReturn(new int[]{UsbPortStatus.COMPLIANCE_WARNING_OTHER});
     }
 }