diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7587cc6..b8d34d2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,8 @@
     <application android:label="@string/app_name"
         android:defaultToDeviceProtectedStorage="true"
         android:forceQueryable="true"
-        android:directBootAware="true">
+        android:directBootAware="true"
+        android:supportsRtl="true">
 
         <service android:name=".storage.CacheQuotaServiceImpl"
              android:permission="android.permission.BIND_CACHE_QUOTA_SERVICE">
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..e36133a
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+{
+  "presubmit": [
+    {
+      "name": "ExtServicesUnitTests"
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "ExtServicesUnitTests"
+    }
+  ],
+  "imports": [
+    {
+      "path": "external/libtextclassifier"
+    }
+  ]
+}