diff --git a/app/device-2020-08-16-204625.png b/app/device-2020-08-16-204625.png
new file mode 100644
index 000000000..a6db1a00e
Binary files /dev/null and b/app/device-2020-08-16-204625.png differ
diff --git a/app/device-2020-08-16-204720.png b/app/device-2020-08-16-204720.png
new file mode 100644
index 000000000..fc86bb009
Binary files /dev/null and b/app/device-2020-08-16-204720.png differ
diff --git a/automotive/automotive_land3.png b/automotive/automotive_land3.png
new file mode 100644
index 000000000..761c7e6b0
Binary files /dev/null and b/automotive/automotive_land3.png differ
diff --git a/automotive/automotive_land4.png b/automotive/automotive_land4.png
new file mode 100644
index 000000000..d5a1d19d5
Binary files /dev/null and b/automotive/automotive_land4.png differ
diff --git a/automotive/automotive_port2.png b/automotive/automotive_port2.png
new file mode 100644
index 000000000..7aa02c867
Binary files /dev/null and b/automotive/automotive_port2.png differ
diff --git a/automotive/automotive_port3.png b/automotive/automotive_port3.png
new file mode 100644
index 000000000..90b79dda9
Binary files /dev/null and b/automotive/automotive_port3.png differ
diff --git a/automotive/src/main/AndroidManifest.xml b/automotive/src/main/AndroidManifest.xml
index ba1bb15ae..d7bd48db1 100644
--- a/automotive/src/main/AndroidManifest.xml
+++ b/automotive/src/main/AndroidManifest.xml
@@ -29,9 +29,21 @@
         android:name="android.hardware.type.automotive"
         android:required="true" />
 
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.screen.portrait"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.screen.landscape"
+        android:required="false" />
+
+
     <uses-sdk tools:overrideLibrary="androidx.car" />
 
     <application
+        android:appCategory="audio"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -41,6 +53,9 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
 
+        <meta-data android:name="com.android.automotive"
+            android:resource="@xml/automotive_app_desc"/>
+
         <!--
         Declare the MediaBrowserService which supports Android Automotive specific
         extensions.
diff --git a/automotive/src/main/ic_launcher-playstore_feature.png b/automotive/src/main/ic_launcher-playstore_feature.png
new file mode 100644
index 000000000..64df6a13f
Binary files /dev/null and b/automotive/src/main/ic_launcher-playstore_feature.png differ
diff --git a/automotive/src/main/res/xml/automotive_app_desc.xml b/automotive/src/main/res/xml/automotive_app_desc.xml
new file mode 100644
index 000000000..dca432823
--- /dev/null
+++ b/automotive/src/main/res/xml/automotive_app_desc.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 Google Inc. All rights reserved.
+  ~
+  ~ 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.
+  -->
+<automotiveApp>
+    <!--
+      ~ This lets Android Auto know that UAMP can act as a media app.
+      ~ See: https://developer.android.com/training/auto/audio/ for more info.
+      -->
+    <uses name="media" />
+</automotiveApp>
\ No newline at end of file
diff --git a/automotive_port1.png b/automotive_port1.png
new file mode 100644
index 000000000..8ed227ade
Binary files /dev/null and b/automotive_port1.png differ