diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index edf0f1c..7796877 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -17,101 +17,22 @@
      Google Dialer. TODO: Need to stop subclassing activities and move this
      back into the main manifest file. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.dialer.app">
+    package="com.android.dialer.app">
 
   <application>
 
     <activity
-      android:exported="false"
-      android:label="@string/dialer_settings_label"
-      android:name="com.android.dialer.app.settings.DialerSettingsActivity"
-      android:parentActivityName="com.android.dialer.main.impl.MainActivity"
-      android:theme="@style/SettingsStyle">
+        android:name="com.android.dialer.app.settings.DialerSettingsActivity"
+        android:exported="false"
+        android:label="@string/dialer_settings_label"
+        android:parentActivityName="com.android.dialer.main.impl.MainActivity"
+        android:theme="@style/SettingsStyle">
       <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.VIEW"/>
         <category android:name="android.intent.category.DEFAULT"/>
         <data android:scheme="header"/>
       </intent-filter>
     </activity>
 
-    <!-- The entrance point for Phone UI.
-         stateAlwaysHidden is set to suppress keyboard show up on
-         dialpad screen. -->
-    <activity-alias
-        android:exported="true"
-        android:name="com.android.dialer.app.DialtactsActivity"
-        android:targetActivity="com.android.dialer.main.impl.MainActivity">
-
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:mimeType="vnd.android.cursor.item/phone"/>
-        <data android:mimeType="vnd.android.cursor.item/person"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:scheme="voicemail"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:scheme="tel"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:mimeType="vnd.android.cursor.dir/calls"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.CALL_BUTTON"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-      </intent-filter>
-      <!-- This was never intended to be public, but is here for backward
-           compatibility.  Use Intent.ACTION_DIAL instead. -->
-      <intent-filter>
-        <action android:name="com.android.phone.action.TOUCH_DIALER"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.TAB"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="com.android.phone.action.RECENT_CALLS"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.TAB"/>
-      </intent-filter>
-    </activity-alias>
-
-    <activity-alias
-        android:exported="true"
-        android:name="com.android.dialer.DialtactsActivity"
-        android:targetActivity="com.android.dialer.main.impl.MainActivity"/>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml
new file mode 100644
index 0000000..c273a57
--- /dev/null
+++ b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.main.impl"/>
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml
index 0643907..a1ed5eb 100644
--- a/java/com/android/dialer/main/impl/AndroidManifest.xml
+++ b/java/com/android/dialer/main/impl/AndroidManifest.xml
@@ -20,6 +20,8 @@
   <application>
 
     <!-- TODO(a bug): remove activity themes and only have application wide themes -->
+    <!-- The entrance point for Phone UI.
+         stateAlwaysHidden is set to suppress keyboard show up on dialpad screen. -->
     <activity
         android:name="com.android.dialer.main.impl.MainActivity"
         android:clearTaskOnLaunch="true"
@@ -36,10 +38,87 @@
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
 
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.item/phone"/>
+        <data android:mimeType="vnd.android.cursor.item/person"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="voicemail"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="tel"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.dir/calls"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.CALL_BUTTON"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+
+      <!-- This was never intended to be public, but is here for backward
+           compatibility.  Use Intent.ACTION_DIAL instead. -->
+      <intent-filter>
+        <action android:name="com.android.phone.action.TOUCH_DIALER"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="com.android.phone.action.RECENT_CALLS"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+
       <meta-data
           android:name="com.android.keyguard.layout"
           android:resource="@layout/keyguard_preview"/>
 
     </activity>
+
+    <!-- This is the historical name of the "main" activity and is kept as an alias for backwards
+         compatibility in case older apps refer to the activity in this way. -->
+
+    <!--  {@deprecated Use .MainActivity instead.} -->
+    <activity-alias
+        android:name="com.android.dialer.app.DialtactsActivity"
+        android:exported="true"
+        android:targetActivity=".MainActivity"/>
+
   </application>
 </manifest>