diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index ef021a6c148ed..05a8a3e1c39d1 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -1112,6 +1112,37 @@ var RESOURCE_COLLECTIONS = {
       "shareables/auto/AndroidAuto-custom-colors.pdf"
     ]
   },
+  "training/auto/overview": {
+    "title": "",
+    "resources": [
+      "training/auto/start/index.html",
+      "design/auto/index.html",
+      "shareables/auto/AndroidAuto-custom-colors.pdf"
+    ]
+  },
+  "training/auto/messaging": {
+    "title": "",
+    "resources": [
+      "training/auto/messaging/index.html",
+      "shareables/auto/AndroidAuto-messaging-apps.pdf",
+      "samples/MessagingService/index.html"
+    ]
+  },
+  "training/auto/media": {
+    "title": "",
+    "resources": [
+      "training/auto/audio/index.html",
+      "shareables/auto/AndroidAuto-audio-apps.pdf",
+      "samples/MediaBrowserService/index.html"
+    ]
+  },
+  "training/auto/distribute": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/auto.html",
+      "distribute/googleplay/auto.html"
+    ]
+  },
   "distribute/stories/games": {
     "title": "",
     "resources": [
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 842a10d9ef108..bad0e14de7cb1 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -1648,7 +1648,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "title": "Android Auto Audio Apps UI Guidelines",
     "summary": "Guidelines for designing audio apps that work with Auto. ",
     "keywords": ["design", "Auto", "Automotive"],
-    "type": "PDF DOWNLOAD (1.1MB)",
+    "type": "Design",
     "titleFriendly": ""
   },
   {
@@ -1661,7 +1661,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "title": "Android Auto Messaging Apps UI Guidelines",
     "summary": "Guidelines for designing messaging apps that work with Auto. ",
     "keywords": ["design", "Auto", "Automotive"],
-    "type": "PDF DOWNLOAD (628KB)",
+    "type": "Design",
     "titleFriendly": ""
   },
   {
@@ -1670,11 +1670,11 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "tags": [],
     "url": "shareables/auto/AndroidAuto-custom-colors.pdf",
     "timestamp": null,
-    "image": "auto/images/assets/icons/auto_app_in_simulator.png",
+    "image": "auto/images/ui/gearhead_generic_UI.png",
     "title": "Android Auto Color Customization UI Guidelines",
     "summary": "Guidelines for color-customizing apps that work with Auto. ",
     "keywords": ["design", "Auto", "Automotive"],
-    "type": "PDF DOWNLOAD (779KB)",
+    "type": "Design",
     "titleFriendly": ""
   },
   {
diff --git a/docs/html/training/auto/audio/index.jd b/docs/html/training/auto/audio/index.jd
index 124180900ac3f..56ec90a8ad63d 100644
--- a/docs/html/training/auto/audio/index.jd
+++ b/docs/html/training/auto/audio/index.jd
@@ -2,6 +2,9 @@ page.title=Providing Audio Playback for Auto
 page.tags="auto", "car", "automotive", "audio"
 page.article=true
 
+page.metaDescription=Learn how to extend your audio apps for use in Android Auto devices.
+page.image=auto/images/assets/icons/media_app_playback.png
+
 @jd:body
 
 <div id="tb-wrapper">
diff --git a/docs/html/training/auto/index.jd b/docs/html/training/auto/index.jd
index 26eee32df431d..c34911cd55fdb 100644
--- a/docs/html/training/auto/index.jd
+++ b/docs/html/training/auto/index.jd
@@ -1,9 +1,84 @@
 page.title=Building Apps for Auto
-page.trainingcourse=true
+page.article=true
+
+meta.tags="auto"
+page.tags="auto"
+
 page.metaDescription=Starting point for building apps for Auto, with guidelines, information, and examples.
-page.image=design/tv/images/focus.png
+
 @jd:body
 
+<iframe width="448" height="252" src="//www.youtube.com/embed/ctiaVxgclsg?autohide=1&amp;showinfo=0" frameborder="0" allowfullscreen="" style="float: right; margin: 0 0 20px 20px;"></iframe>
+
+<p>
+  The Android platform enables you to extend your app to work with in-vehicle console systems
+  running Android Auto. These systems provide a simplified interface for apps that can be used in
+  a car, allowing users to take your app with them on the way to the grocery store or on a long
+  road trip.
+</p>
+
+<p>
+  Apps that work with Android Auto consoles run on a connected device, such as a phone or
+  tablet. The app communicates via specific APIs with the in-dash console, which provides a user
+  interface for the connected app that is designed for use in a car.
+</p>
+
+<p>
+  For more information, follow the links below to learn how to extend your Android app to support
+  use in vehicles.
+</p>
 
 
-<p>These classes teach you how to build and extend apps to work with Auto devices.</p>
\ No newline at end of file
+<h2 id="overview">Get Started</h2>
+
+<p>
+  Learn the basics of extending your app for use in vehicles, with information about app
+  configuration and user interface design considerations:
+</p>
+
+<div class="resource-widget resource-flow-layout col-12"
+  data-query="collection:training/auto/overview"
+  data-cardSizes="12x6, 6x3x2"
+  data-maxresults="6">
+</div>
+
+
+<h2 id="media">Audio Apps</h2>
+
+<p>
+  Learn how to extend your audio app to enable content navigation and playback through a vehicle
+  console:
+</p>
+
+<div class="resource-widget resource-flow-layout landing col-12"
+  data-query="collection:training/auto/media"
+  data-cardSizes="9x6, 9x3x2"
+  data-maxResults="4">
+</div>
+
+
+<h2 id="messaging">Messaging Apps</h2>
+
+<p>
+  Learn how to extend your messaging app to provide text communication services through a vehicle
+  console:
+</p>
+
+<div class="resource-widget resource-flow-layout landing col-12"
+  data-query="collection:training/auto/messaging"
+  data-cardSizes="9x6, 9x3x2"
+  data-maxResults="6">
+</div>
+
+
+<h2 id="distribute">App Quality and Distribution</h2>
+
+<p>
+  Learn how to distribute your Auto app and how apps are evaluated for quality and driver safety:
+</p>
+
+<div class="resource-widget resource-flow-layout landing col-12"
+  data-query="collection:training/auto/distribute"
+  data-cardSizes="9x3"
+  data-maxResults="6">
+</div>
diff --git a/docs/html/training/auto/messaging/index.jd b/docs/html/training/auto/messaging/index.jd
index 70ac205df0ca4..7540a3f143247 100644
--- a/docs/html/training/auto/messaging/index.jd
+++ b/docs/html/training/auto/messaging/index.jd
@@ -2,6 +2,9 @@ page.title=Providing Messaging for Auto
 page.tags="auto", "car", "automotive", "messaging"
 page.article=true
 
+page.metaDescription=Learn how to extend your messaging app for use in Android Auto devices.
+page.image=auto/images/assets/icons/messaging_app_notifications.png
+
 @jd:body
 
 <div id="tb-wrapper">
diff --git a/docs/html/training/enterprise/index.jd b/docs/html/training/enterprise/index.jd
index 10be14efd5bd2..fce09b94a5f9d 100644
--- a/docs/html/training/enterprise/index.jd
+++ b/docs/html/training/enterprise/index.jd
@@ -2,7 +2,6 @@ page.title=Building Apps for Work
 meta.tags="work, enterprise, corporate"
 page.tags="work", "enterprise", "corporate"
 page.metaDescription=Learn how to build Android apps for the enterprise and take advantage of Google's Android for Work program.
-page.tags="education"
 page.article=true
 
 @jd:body