diff --git a/core/OWNERS b/core/OWNERS
index c98196a7c1..36951a9589 100644
--- a/core/OWNERS
+++ b/core/OWNERS
@@ -7,3 +7,6 @@ per-file version_defaults.mk = ankurbakshi@google.com,bkhalife@google.com,jainne
 
 # For sdk extensions version updates
 per-file version_defaults.mk = amhk@google.com,gurpreetgs@google.com,mkhokhlova@google.com,robertogil@google.com
+
+# For Ravenwood test configs
+per-file ravenwood_test_config_template.xml = jsharkey@google.com,omakoto@google.com
diff --git a/core/ravenwood_test_config_template.xml b/core/ravenwood_test_config_template.xml
index b9002687b1..16a22c0628 100644
--- a/core/ravenwood_test_config_template.xml
+++ b/core/ravenwood_test_config_template.xml
@@ -22,6 +22,7 @@
     <option name="use-ravenwood-resources" value="true" />
     <option name="exclude-paths" value="java" />
     <option name="socket-timeout" value="10000" />
+    <option name="null-device" value="true" />
 
     {EXTRA_CONFIGS}
 
@@ -36,5 +37,8 @@
         <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
         <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
         <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+
+        <!-- Needed for supporting ParcelFileDescriptor internals -->
+        <option name="java-flags" value="--add-exports=java.base/jdk.internal.access=ALL-UNNAMED"/>
     </test>
 </configuration>