diff --git a/AUTHORS b/AUTHORS
index 462c0a304..ddaa79f3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,7 +13,7 @@ ChangJoo Park <pcjpcj2@gmail.com>
 Amol Grover <frextrite@gmail.com>
 Jeremy Judeaux <jeremy.judeaux@volune.net>
 Letticia Nicoli <letticia.nicoli@gmail.com>
-Alex Li <google@alexv525.com>
+Alex Li <alexv.525.li@gmail.com>
 Marcus Tomlinson <themarcustomlinson@gmail.com>
 Juyeong Lee <juyeonglee0413@gmail.com>
 Hrishikesh Kadam <hrkadam.92@gmail.com>
diff --git a/resources/META-INF/android-contribs.xml b/resources/META-INF/android-contribs.xml
new file mode 100644
index 000000000..41d9fe2bf
--- /dev/null
+++ b/resources/META-INF/android-contribs.xml
@@ -0,0 +1,3 @@
+<!-- Defines Android-supported IDE-specific contributions and implementations. -->
+<idea-plugin>
+</idea-plugin>
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index e792c0611..af55cb6a5 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -29,7 +29,6 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.xdebugger</depends>
   <depends>org.jetbrains.plugins.yaml</depends>
-  <depends>org.jetbrains.android</depends>
   <depends>Dart</depends>
   <depends>Git4Idea</depends>
 
@@ -43,6 +42,9 @@
   <!-- Contributes Gemini Code Assist extensions. -->
   <depends optional="true" config-file="gemini-contribs.xml">com.google.tools.ij.aiplugin</depends>
 
+  <!-- Contributes Android-supported features and implementations. -->
+  <depends optional="true" config-file="android-contribs.xml">org.jetbrains.android</depends>
+
   <!-- Contributes Android Studio-specific features and implementations. -->
   <!--suppress PluginXmlValidity -->
   <depends optional="true" config-file="studio-contribs.xml">com.intellij.modules.androidstudio</depends>
diff --git a/resources/META-INF/plugin_template.xml b/resources/META-INF/plugin_template.xml
index 8eea4869f..68fc308c0 100644
--- a/resources/META-INF/plugin_template.xml
+++ b/resources/META-INF/plugin_template.xml
@@ -27,7 +27,6 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.xdebugger</depends>
   <depends>org.jetbrains.plugins.yaml</depends>
-  <depends>org.jetbrains.android</depends>
   <depends>Dart</depends>
   <depends>Git4Idea</depends>
 
@@ -41,6 +40,9 @@
   <!-- Contributes Gemini Code Assist extensions. -->
   <depends optional="true" config-file="gemini-contribs.xml">com.google.tools.ij.aiplugin</depends>
 
+  <!-- Contributes Android-supported features and implementations. -->
+  <depends optional="true" config-file="android-contribs.xml">org.jetbrains.android</depends>
+
   <!-- Contributes Android Studio-specific features and implementations. -->
   <!--suppress PluginXmlValidity -->
   <depends optional="true" config-file="studio-contribs.xml">@DEPEND@</depends>