update preview overview and update images.

Change-Id: Ie4c37f5895e15313cc4dd58ef72a8fcd5ab20189
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 3b29318..460d056 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -63,7 +63,6 @@
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
     data-query="type:youtube+tag:develop+tag:featured, type:blog+tag:develop+tag:featured"
-    data-query="collection:develop/landing/latest"
     data-sortOrder="-timestamp"
     data-cardSizes="6x6"
     data-items-per-page="6"
diff --git a/docs/html/images/home/n-preview-hero.png b/docs/html/images/home/n-preview-hero.png
index c0ec407..b9636dd 100644
--- a/docs/html/images/home/n-preview-hero.png
+++ b/docs/html/images/home/n-preview-hero.png
Binary files differ
diff --git a/docs/html/images/home/n-preview-hero_2x.png b/docs/html/images/home/n-preview-hero_2x.png
index 325ac6d..c59d195 100644
--- a/docs/html/images/home/n-preview-hero_2x.png
+++ b/docs/html/images/home/n-preview-hero_2x.png
Binary files differ
diff --git a/docs/html/images/n-preview-updates-narrow_2x.png b/docs/html/images/n-preview-updates-narrow_2x.png
new file mode 100644
index 0000000..cf2ad90
--- /dev/null
+++ b/docs/html/images/n-preview-updates-narrow_2x.png
Binary files differ
diff --git a/docs/html/images/n-preview-updates_2x.png b/docs/html/images/n-preview-updates_2x.png
new file mode 100644
index 0000000..ec64d68
--- /dev/null
+++ b/docs/html/images/n-preview-updates_2x.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index e46add9..6066531 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -18,7 +18,7 @@
 
 <section class="dac-expand dac-hero dac-invert" style="background-color:#455A64">
   <div class="wrap" style="max-width:1100px;margin-top:0">
-    <div class="col-7of16 col-push-9of16">
+    <div class="col-7of16 col-push-9of16" style="padding-left:2em;">
       <a href="{@docRoot}preview/index.html">
         <h1 class="dac-hero-title">Android N Developer Preview</h1>
         <p class="dac-hero-description">
@@ -38,7 +38,7 @@
         </a><br>-->
       </a>
     </div>
-    <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:0em;padding-right:2em;">
+    <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:0em;padding-right:1.5em;">
       <a href="{@docRoot}preview/index.html">
         <img style="" class="dac-hero-image" src="/images/home/n-preview-hero.png"
              srcset="/images/home/n-preview-hero.png 1x,
@@ -84,7 +84,7 @@
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Get the SDK
+        Get Android Studio
       </a></div>
       <div><a href="{@docRoot}samples/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index cfa9fa2..1f8604a 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -141,9 +141,8 @@
       "preview/overview.html",
       "preview/api-overview.html",
       "preview/behavior-changes.html",
-      "preview/download.html",
-      "preview/samples.html",
       "preview/setup-sdk.html",
+      "preview/samples.html",
       "preview/support.html"
     ]
   },
@@ -151,8 +150,15 @@
     "title": "",
     "resources": [
       "preview/features/multi-window.html",
+      "preview/features/notification-updates.html",
       "preview/features/background-optimization.html",
-      "preview/features/notification-updates.html"
+      "preview/features/data-saver.html",
+      "preview/features/direct-boot.html",
+      "preview/features/icu4j-framework.html",
+      "preview/features/multilingual-support.html",
+      "preview/features/scoped-folder-access.html",
+      "preview/features/picture-in-picture.html",
+      "preview/features/tv-recording-api.html"
     ]
   },
   "google/landing/services": {
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index d35dbb54..f43ddd6 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -4718,6 +4718,32 @@
     "sdk/installing/studio-tips.html",
     ]
   },
+  "preview/landing/resources": {
+    "title": "",
+    "resources": [
+      "preview/overview.html",
+      "preview/api-overview.html",
+      "preview/behavior-changes.html",
+      "preview/setup-sdk.html",
+      "preview/samples.html",
+      "preview/support.html"
+    ]
+  },
+  "preview/landing/more": {
+    "title": "",
+    "resources": [
+      "preview/features/multi-window.html",
+      "preview/features/notification-updates.html",
+      "preview/features/background-optimization.html",
+      "preview/features/data-saver.html",
+      "preview/features/direct-boot.html",
+      "preview/features/icu4j-framework.html",
+      "preview/features/multilingual-support.html",
+      "preview/features/scoped-folder-access.html",
+      "preview/features/picture-in-picture.html",
+      "preview/features/tv-recording-api.html"
+    ]
+  }
 };
 
 /**
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index df18330..36341b2 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -1,7 +1,7 @@
 page.title=Android N APIs &amp; Features
 meta.tags="preview", "androidn"
 page.tags="preview", "developer preview"
-page.image=images/cards/card-n-overview_2x.png
+page.image=images/cards/card-n-apis_2x.png
 @jd:body
 
 <p>
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 826dc50..778487d 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -7,15 +7,25 @@
 footer.hide=1
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <section class="dac-expand dac-hero dac-light" style="background-color:#B2DFDB">
   <div class="wrap" style="max-width:1100px;margin-top:0">
     <div class="cols dac-hero-content" style="padding-bottom:1em;">
 
-      <div class="col-7of16 col-push-9of16">
+      <div class="col-7of16 col-push-9of16" style="padding-left:2em">
         <h1 class="dac-hero-title">Android N Developer Preview</h1>
         <p class="dac-hero-description">
-          Get ready for the next version of Android!
-          <strong>Test your apps</strong> on a variety of Nexus devices. Support new system
+          Get ready for Android N!
+          <strong>Test your apps</strong> Nexus and other devices. Support new system
           behaviors to <strong>save power and memory</strong>.
           Extend your apps with <strong>multiwindow UI</strong>,
           <strong>direct reply notifications</strong> and more.
@@ -30,7 +40,7 @@
           Update to Developer Preview (final SDK)
         </a><br>-->
       </div>
-      <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:1.5em;padding-right:2em;">
+      <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:1.5em;padding-right:1.5em;">
         <img class="dac-hero-image" src="{@docRoot}images/home/n-preview-hero.png"
              srcset="{@docRoot}images/home/n-preview-hero.png 1x,
              {@docRoot}images/home/n-preview-hero_2x.png 2x">
@@ -45,30 +55,67 @@
   </div>
 </section>
 
-<section class="dac-section dac-gray"><div class="wrap">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Report an issue
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}preview/support.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          See known issues
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}preview/dev-community">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none;color:black" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+
+    <div class="actions">
+      <div><a href="">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Report an issue
+      </a></div>
+      <div><a href="{@docRoot}preview/support.html">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        See known issues
+      </a></div>
+      <div><a href="{@docRoot}preview/dev-community">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Join Dev Community
+      </a></div>
+    </div><!-- end .actions -->
+  </div><!-- end .wrap -->
+</div>
+
+<section class="dac-section dac-light"><div class="wrap">
   <h1 class="dac-section-title">Resources</h1>
   <div class="dac-section-subtitle">
-    Essential information to help get your apps ready for the next version of Android.
+    Essential information to help you get your apps ready for Android N.
   </div>
 
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:preview/landing/more"
        data-cardSizes="6x6"
-       data-maxResults="16"></div>
+       data-items-per-page="6"
+       data-maxResults="15"
+       data-initial-results="6"></div>
 
-    <ul class="dac-section-links">
-      <li class="dac-section-link">
-        <a href="https://code.google.com/p/android-developer-preview/">
-          <span class="dac-sprite dac-auto-chevron"></span>
-          Report Issues
-        </a>
-      </li>
-      <li class="dac-section-link"><a href="http://developer.android.com/preview/dev-community">
-        <span class="dac-sprite dac-auto-chevron"></span>
-        Join G+ Community
-        </a>
-      </li>
-    </ul>
   </div>
 </section>
 
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index 87f08b1..bb056f7 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -1,29 +1,67 @@
 page.title=Program Overview
-page.metaDescription=Welcome to the Android M Developer Preview, a program that gives you everything you need to test and optimize your apps for the next version of Android.
+page.metaDescription=Get your apps ready for the next version of Android.
 page.image=images/cards/card-n-overview_2x.png
 meta.tags="preview", "developer", "android"
 page.tags="preview", "developer", "android"
 
 @jd:body
+<!--
+<div class="cols" style=
+"background-color:#f2daf5; padding: 5px 0;margin-bottom:1em; text-align:center;">
+<h3>
+    Developer Preview 3 is now available
+  </h3>
+  <p>Includes final SDK and near-final system images</p>
+   <div style="margin:auto 1em">
+ <ul class="dac-section-links">
+    <li class="dac-section-link">
+      <a href="{@docRoot}preview/support.html#preview3-notes">
+      <span class="dac-sprite dac-auto-chevron"></span>
+      Read the Notes</a>
+    </li>
+
+    <li class="dac-section-link">
+      <a href="{@docRoot}preview/support.html#preview3-get">
+      <span class="dac-sprite dac-auto-chevron"></span>
+      Get the Update</a>
+    </li>
+
+    <li class="dac-section-link">
+      <a href="https://code.google.com/p/android-developer-preview/">
+      <span class="dac-sprite dac-auto-chevron"></span>
+      Report Issues</a>
+    </li>
+  </ul>
+  </div>
+</div>
+-->
 
 <p>
-  Welcome to the <strong>Android N Developer Preview</strong>, a program that gives you
-  everything you need to test and optimize your apps for the next version of
-  Android. It's free, and you can get started right away just by downloading
-  the Preview tools.
+  Welcome to the <strong>Android N Developer Preview</strong>, a program that
+  gives you everything you need to test and optimize your apps for the next
+  version of Android. It's free, and you can get started right away just by
+  downloading the N Developer Preview tools.
 </p>
 
+
+
+
+
+
+
 <div style="background-color:#eceff1;padding:1em;">
 <div class="wrap">
   <div class="cols">
     <div class="col-4of12">
       <h5>
-        Hardware and emulator system images
+        Hardware and emulator images
       </h5>
 
       <p>
-        Run and test your apps on Nexus 5X, 6P, 9, and Player (for TV), as well
-        as emulator.
+        Run and test your apps on Nexus 5X, 6, 6P, 9,
+        Pixel C, and Player, as well as other hardware
+        devices and emulator.
+
       </p>
     </div>
 
@@ -33,21 +71,21 @@
       </h5>
 
       <p>
-        We’ll provide multiple updates during the Preview, so you’ll be testing
-        against the latest platform changes.
+        We’ll provide monthly updates during the Preview, so you’ll be testing against the latest platform changes.
       </p>
     </div>
 
     <div class="col-4of12">
       <h5>
-        Updates delivered by OTA
+        Priority for developer issues
       </h5>
 
       <p>
-        You can get updates over-the-air, once you’ve flashed a
-        device to the initial preview.
+        During the first several weeks we’ll give priority to developer-reported
+        issues, so test and give feedback as soon as possible.
       </p>
     </div>
+
   </div>
 
   <div class="cols">
@@ -59,19 +97,17 @@
       </h5>
 
       <p>
-        Start work early to support new platform behaviors such as
-        the new runtime permissions model and power-saving features.
+        Start work early to support new platform behaviors and develop with new features.
       </p>
     </div>
 
     <div class="col-4of12">
-      <h5>
-        Priority window for developer-reported issues
+        <h5>
+        Updates delivered by OTA
       </h5>
 
       <p>
-        During the first several weeks we’ll give priority to developer-reported
-        issues, so test and give feedback as soon as possible.
+        Seamless over-the-air updates for any supported device through the Android Beta Program. No flashing is needed.
       </p>
     </div>
 
@@ -81,10 +117,8 @@
       </h5>
 
       <p>
-        Report issues and give us feedback using our <a href=
-        "https://code.google.com/p/android-developer-preview/">issue tracker</a>.
-        Connect with other developers in the <strong>Developer Community</strong>.
-
+        Report issues and give us feedback using our <a href="https://code.google.com/p/android-developer-preview/">issue tracker</a>.
+        Connect with other developers in the <a href="http://developer.android.com/preview/dev-community">N&nbsp;Developer Community</a>.
       </p>
     </div>
   </div>
@@ -92,204 +126,337 @@
 </div>
 
 <!--
+<p>New in the Android N Developer Preview: </p>
+
+<ul>
+  <li> Accompanying Android Beta Program for consumers, starting later in the preview</li>
+  <li> More supported devices, including devices from OEM partners</li>
+  <li> Seamless OTAs for your devices, from initial release to final N release without flashing</li>
+</ul>
+-->
+
+<h2 id="timeline">Timeline and updates</h2>
+<img src="{@docRoot}images/n-preview-updates_2x.png">
+
 <p>
-  With the Preview, you'll get an early start on testing your apps,
-  with enough time to make adjustments before the public platform release later
-  in the year. We'll provide several updates to the Preview tools in the weeks
-  ahead, so you can keep in sync with the latest changes as the platform moves
-  toward launch.
+  The N Developer Preview runs from 9 March 2016 until the final Android N
+  public release to AOSP and OEMs, planned for Q3 2016.
 </p>
 
 <p>
-  You can help us improve the platform by <a href=
-  "https://code.google.com/p/android-developer-preview/">reporting issues</a>
-  through our feedback channels. This is especially
-  critical in the first month of the preview, when we’ll be giving priority to
-  developer-reported issues and feedback.
-</p> -->
+  At key development milestones, we’ll deliver updates for your development and
+  testing environment. In general you can expect an update each month (4 to 6
+  week interval). The milestones are listed below.
+</p>
 
+<ul>
+  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong> (initial release, alpha)</li>
+  <li><strong>Preview 2</strong> (incremental update, beta)</li>
+  <li><strong>Preview 3</strong> (incremental update, beta)</li>
+  <li><strong>Preview 4</strong> (final APIs and official SDK, Play publishing)</li>
+  <li><strong>Preview 5</strong> (near-final system images for final testing)</li>
+  <li><strong>Final release</strong> to AOSP and ecosystem</li>
+</ul>
 
-<h2 id="timeline">
-  Timeline and updates
-</h2>
 <p>
-  The Preview runs from March 9 until the final Android N public release planned for Q3
-  2016.
+  Each update includes SDK tools, preview system images, emulators, reference
+  documentation, and API diffs.
+</p>
+
+<p>
+  The <strong>first three preview milestones</strong> provide an <strong>early
+  test and development environment</strong> that help you identify
+  compatibility issues in your current apps and plan migration or feature work
+  needed to target the new platform. This is the priority period in which to
+  give us your feedback on features and APIs and file compatibility issues
+  &mdash; for all of these, please use the issue tracker [link]. You can expect
+  some API changes across these updates.
+</p>
+
+<p>
+  At <strong>previews 4 and 5</strong> you’ll have access to the <strong>final
+  N APIs and SDK</strong> to develop with, as well as near-final system images
+  to test system behaviors and features. Android N will provide a standard API
+  level at this time. You can begin final compatibility testing of your legacy
+  apps and refine any new code that is using the N APIs or features.
+</p>
+
+<p>
+  Also starting in preview 4, you’ll be able to <strong>publish apps to
+  devices</strong> running Android N at the official API level, such as
+  consumer devices that have opted into the Android Beta program. You can
+  publish into the Google Play alpha and beta channels first, so you can test
+  your apps with Android Beta consumers before distributing broadly on the
+  store.
 </p>
 
 <p>
   As you test and develop on Android N, we strongly recommend <strong>keeping
-  your development environment up-to-date</strong> as Preview updates are released.
-  To make the process easier, we'll deliver <strong>updates over-the-air
-  (OTA)</strong> to devices already flashed to a Preview build, as well as
-  providing system images that you can download and flash manually.
+  your development environment up-to-date</strong> as preview updates are
+  released. To make the process easier, you can enroll your test devices in the
+  Android Beta program and get <strong>updates over-the-air (OTA)</strong> at
+  each milestone. Alternatively, updated preview images are available that you
+  download and flash manually.
 </p>
 
 <p>
-  We’ll notify you when Preview updates are available via the <a href=
+  We’ll notify you when preview updates are available via the <a href=
   "http://android-developers.blogspot.com/">Android Developers Blog</a>, as
-  well as this site and the <strong>Android N Developer Community</strong>.
+  well as this site and the <a href="https://developer.android.com/preview/dev-community">Android
+  N Developer Community</a>.
 </p>
 
-<h2 id="preview_tools">
-  What’s in the Preview?
-</h2>
+
+<h2 id="preview_tools">What's in the N Developer Preview?</h2>
 
 <p>
-  The Preview includes everything you need to test your existing
+  The N Developer Preview includes everything you need to test your existing
   apps on a variety of screen sizes, network technologies, CPU/GPU chipsets,
   and hardware architectures.
 </p>
 
-<h4>
-  SDK tools
-</h4>
+<h3 id="sdk_tools">SDK tools</h3>
+
+<p>You can download these components through the SDK Manager in <a href="{@docRoot}sdk/installing/adding-packages.html">Android Studio</a>:</p>
+
+<ul>
+  <li> N Developer Preview <strong>SDK and tools</strong>
+  <li> N Developer Preview <strong>emulator system image</strong> (32-bit & 64-bit)
+  <li> N Developer Preview <strong>emulator system Image for Android TV</strong> (32-bit)
+  <li> N Developer Preview support libraries (for new app templates)
+</ul>
 
 <p>
-  You can download these components through the SDK Manager in <a href=
-  "{@docRoot}sdk/installing/adding-packages.html">Android Studio</a>:
+  We’ll provide updates to these development tools at each milestone as needed.
+</p>
+
+<h3 id="hardware_system_images">Hardware system images</h3>
+
+<p>
+  The N Developer Preview includes hardware system images that you can use when
+  testing and developing on physical devices.
+</p>
+
+<p>
+  You can download these Nexus hardware system images from the <a href=
+  "{@docRoot}preview/download.html">Downloads page</a>:
 </p>
 
 <ul>
-  <li><strong>Official Preview SDK and tools</strong>
-  </li>
-
-  <li>N Preview <strong>emulator system image</strong> (32-bit &amp;
-  64-bit)
-  </li>
-
-  <li>N Preview <strong>emulator system Image for Android TV</strong>
-  (32-bit)
-  </li>
+  <li> <strong>Nexus 5X</strong> (GSM/LTE) "bullhead" device system image</li>
+  <li> <strong>Nexus 6 (GSM/LTE)</strong> "shamu" device system image</li>
+  <li> <strong>Nexus 6P (GSM/LTE)</strong> "angler" device system image</li>
+  <li> <strong>Nexus 9</strong> (Wi-Fi) "volantis" device system image</li>
+  <li> <strong>Nexus Player</strong> (Android TV) "fugu" device system image</li>
+  <li> <strong>Pixel C</strong> "ryu" device system image</li>
 </ul>
 
-<h4>
-  Hardware system images
-</h4>
-
-<p>
-  You can download these hardware system images for Nexus devices from the
-  <a href="download.html">Downloads page</a>:
-</p>
+<p>In addition, you can download these hardware system images from our Developer
+Preview partners:</p>
 
 <ul>
-  <li>
-    <strong>Nexus 5X</strong> (GSM/LTE) "bullhead" device system image
-  </li>
-
-  <li>
-    <strong>Nexus 6P</strong> (GSM/LTE) “angler” device system image
-  </li>
-
-  <li>
-    <strong>Nexus 9</strong> (Wi-Fi) “volantis” device system image
-  </li>
-
-  <li>
-    <strong>Nexus Player</strong> (Android TV) “fugu” device system image
-  </li>
+  <li><strong>General Mobile 4G Dual (Android One)</strong> "seed" device system image</li>
 </ul>
 
-<h4>
-  Documentation and sample code
-</h4>
-
 <p>
-  These documentation resources help you learn about the Preview:
+  We’ll deliver updated system images for these devices at each milestone. You
+  can download and flash the updated system images to your test devices
+  manually, as frequently as you need. This is especially useful for automated
+  testing environments where you might need to reflash your device multiple
+  times.
 </p>
 
-<ul>
-  <li>
-    <a href="setup-sdk.html">Set Up the SDK</a> has step-by-step instructions
-    for getting started.
-  </li>
-
-  <li>
-    <a href="{@docRoot}preview/testing/guide.html">Testing Guide</a> and <a href=
-    "behavior-changes.html">Behavior Changes</a> point you to key areas to test.
-  </li>
-
-  <li>Documentation of new APIs, including an <a href="api-overview.html">API Overview</a>,
-  downloadable <a href="{@docRoot}preview/download.html#docs">API Reference</a>, and detailed developer guides on
-  key features such as
-  <a href="{@docRoot}preview/features/runtime-permissions.html">permissions</a>,
-  <a href="{@docRoot}preview/backup/index.html">app backup</a>, and others.
-  </li>
-
-  <li>
-    <a href="{@docRoot}preview/samples.html">Sample code</a> that demonstrates how to support
-    permissions and other new features.
-  </li>
-
-  <li>
-    <a href="{@docRoot}preview/support.html#release-notes">Release notes</a> for the current version
-    of the Preview, including change notes and diff reports.
-  </li>
-</ul>
-
-<h4>
-  Support resources
-</h4>
-
-<p>
-  Use these support resources as you test and develop on the Preview:
+<p class="note"><strong>Note</strong>:
+  <strong>Devices flashed manually will not get OTA updates</strong> like in
+  last year’s preview. This year, you can get OTAs by enrolling devices in the
+  Android Beta Program &mdash; see details in the next section.
 </p>
 
-<ul>
-  <li><a href="https://code.google.com/p/android-developer-preview/">Preview Issue Tracker</a>
-  is your <strong>primary feedback
-  channel.</strong> You can report bugs, performance issues, and general
-  feedback through the issue tracker. You can also check for <a
-  href="https://code.google.com/p/android-developer-preview/wiki/KnownIssues">known issues</a>
-  and find workaround steps.
-  </li>
-
-  <li><strong>Android N Developer Community</strong> is a Google+ community where you can
-  <strong>connect with other developers</strong> working with Android M. You can share
-  observations or ideas or find answers to questions about Android M.
-  </li>
-</ul>
-
-
-<h2 id="get_started">
-  How to get started
-</h2>
+<h3 id="android_beta">OTA Updates through Android Beta Program</h3>
 
 <p>
-  To get started testing your app with the Preview:
+  New for Android N is an Over-the-Air (OTA) update program that automatically
+  delivers the latest preview updates of Android N directly to devices enrolled
+  in the program. The program is free, and it’s open to anyone who has a
+  supported device that’s registered to their Google account.
+</p>
+
+<p>
+  To enroll in the program visit the Android Beta Program site [LINK]. You’ll
+  see all of the devices registered to your account that are eligible to enroll
+  in Android Beta.
 </p>
 
 <ol>
-  <li>Review the <a href="{@docRoot}preview/api-overview.html">API Overview</a>
-    and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a> to get an
-    idea of what's new and how it affects your apps. In particular, learn about
-    the new <a href="{@docRoot}preview/features/runtime-permissions.html">runtime
-    permissions</a> model, power-saving features, and auto backup.
-  </li>
+  <li> Choose the devices you want to receive the Android N updates
+  <li> Click Enroll, read and agree to the terms of service, and then click OK
+</ol>
 
-  <li>Set up your environment by following the instructions for
-    <a href="{@docRoot}preview/setup-sdk.html">Setting up the Preview SDK</a>
-    and configuring test devices.
-  </li>
+<p>
+  Once you’ve enrolled, your device will soon receive an update. In most cases,
+  you will not need to do a full reset of your data to move to Android N, but
+  it’s recommended that you back up any data you don’t want to lose before
+  enrolling the device.
+</p>
 
-  <li>Follow the <a href="https://developers.google.com/android/nexus/images">
-    flashing instructions</a> to flash the latest M developer preview system image
-    for Nexus 5, 6, 9, and Player. Once you've flashed your development device,
-    Preview updates will be delivered through over-the-air (OTA) updates.</a>
-  </li>
+<p>
+  As updates are delivered to your device, we recommend downloading and
+  installing them as soon as possible. You’ll want to stay current with the
+  latest changes in system UI, behavior, APIs, and features.
+</p>
 
-  <li>Review the <a href="{@docRoot}reference/packages.html">API
-  Reference</a> and <a href="{@docRoot}preview/samples.html">N Preview
-  samples</a> to gain more insight into new API features and how to use them in
-  your app.
-  </li>
+<p>
+  At the conclusion of the Developer Preview, your enrolled devices will
+  receive an update to the official Android N release.
+</p>
 
-  <li>Join the <strong>Android M
-  Developer Community</strong> to get the latest news and connect with other
-  developers working with the new platform.
-  </li>
+<p>
+  You can un-enroll your devices from the Android Beta program at any time from
+  the Android Beta site. Before un-enrolling, make sure to back-up your data on
+  the device.
+</p>
+
+  <p class="note"><strong>Note</strong>: 
+  When you un-enroll, <strong>your device will be factory reset</strong>
+  to the latest version
+  of Android 6.0 Marshmallow (not necessarily the version that you had
+  installed prior to enrolling the device). To ensure a clean installation,
+  your data will be erased from the device, including contacts, messages,
+  photos, and so on.
+</p>
+
+<h3 id="documentation_and_sample_code">Documentation and sample code</h3>
+
+<p>
+  These documentation resources are available on the Developer Preview site to
+  help you learn about the Android&nbsp;N:
+</p>
+
+<ul>
+  <li> <a href="{@docRoot}preview/setup-sdk.html">Setting Up the SDK</a> has
+  step-by-step instructions for getting started.</li>
+  <li> <a href="{@docRoot}preview/testing/guide.html">Testing Guide</a>
+  and <a href="{@docRoot}preview/behavior-changes.html">Behavior
+  Changes</a> point you to key areas to test.</li>
+  <li> Documentation of new APIs, including an <a
+  href="{@docRoot}preview/api-overview.html">API Overview</a>, downloadable
+  <a href="{@docRoot}preview/download.html#docs">API
+  Reference</a>, and detailed developer guides on key features such as add
+  here, and others.
+  <li> <a href="{@docRoot}preview/samples.html">Sample code</a> that
+  demonstrates how to support permissions and other new features.
+  <li> <a href="{@docRoot}preview/support.html#release-notes">Release notes</a>
+  for the current version of the N Developer Preview, including change notes and
+  diff reports.
+</ul>
+
+<h4 id="reference">Downloadable API Reference</h4>
+
+<p>
+  During the early preview updates, you can download the latest API reference
+  for the Android N platform as a separate zip archive. [LINK] The reference
+  download also includes a diff report that helps you identify API changes from
+  API 23 and the previous update.
+</p>
+
+<p>
+  When the Android N APIs are final and an official API level is assigned,
+  we’ll provide the API reference to you online at <a href=
+  "https://developer.android.com">https://developer.android.com</a>.
+</p>
+
+<h3 id="support_resources">
+  Support resources
+</h3>
+
+<p>
+  As you test and develop on the N Developer Preview, please use these channels
+  to report issues and give feedback.
+</p>
+
+<ul>
+  <li> <a href="https://code.google.com/p/android-developer-preview/">N Developer Preview Issue
+    Tracker</a> is your <strong>primary feedback channel.</strong> You can report bugs, performance
+    issues, and general feedback through the issue tracker. You can also check for <a
+    href="https://code.google.com/p/android-developer-preview/wiki/KnownIssues">known issues</a> and
+    find workaround steps. We’ll keep you updated on your issue as it’s triaged and sent to
+    the Android engineering team for review. </li>
+  <li> The <a href="https://developer.android.com/preview/dev-community">Android N Developer Community</a> is
+    a Google+ community where you can <strong>connect with other developers</strong>working with
+    Android N. You can share observations or ideas or find answers to
+    questions about Android N. We’ll moderate the community and provide answers and
+    guidance as needed.</li>
+</ul>
+
+<h3 id="targeting">Targeting, preview APIs, and publishing</h3>
+
+<p>
+  The N Developer Preview provides a development-only system and Android
+  library that <strong>does not have a standard API level</strong>. If you want
+  to opt out of compatibility behaviors to test your app (which is strongly
+  recommended), you can target the preview version of Android N by setting your
+  app's <code><a href=
+  "{@docRoot}guide/topics/manifest/uses-sdk-element.html">targetSdkVersion</a></code>
+  to <code>“N”</code>.
+</p>
+
+<p>
+  The Android N Developer Preview delivers <strong>preview APIs</strong>
+  &mdash; the APIs will not be official until the final SDK is released,
+  currently planned for the third quarter of 2016. This means that you can
+  <strong>expect minor API changes</strong> over time, especially during
+  initial weeks of the program. We’ll provide a summary of changes to you with
+  each update of the Android N Developer Preview.
+</p>
+
+<p class="note">
+  <strong>Note</strong>: Although preview APIs may change, underlying
+  system behaviors are stable and ready for testing against
+  right away.
+</p>
+
+<p>
+  Google Play <strong>prevents publishing of apps targeting the N Developer
+  Preview</strong>. When the Android N final SDK is available, you’ll be able
+  to target the official Android N API level and publish your app to Google
+  Play via the alpha and beta release channels. Meanwhile, if you want to
+  distribute an app targeting Android M to testers, you can do so via email or
+  by direct download from your site.
+</p>
+
+<p>
+  At the full release of Android N to AOSP and OEMs, planned for Q3 2016,
+  you’ll be able to publish your apps targeting Android N to the public release
+  channel in Google Play.
+</p>
+
+
+<h2 id="how_to_get_started">How to get started</h2>
+
+<p>
+  To get started testing your app with Android N:
+</p>
+
+<ol>
+  <li> Review the <a href="{@docRoot}preview/api-overview.html">API Overview</a>
+  and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a> to
+  get an idea of what's new and how it affects your apps. In particular,
+  learn about the new <a href="{@docRoot}preview/features/runtime-permissions.html">runtime
+  permissions</a> model, power-saving features, and auto backup.</li>
+  <li> Set up your environment by following the instructions for <a
+  href="{@docRoot}preview/setup-sdk.html">Setting up the Preview SDK</a>
+  and configuring test devices.</li>
+  <li> Follow the <a href="https://developers.google.com/android/nexus/images">flashing
+  instructions</a> to flash the latest N Developer Preview system image for Nexus 5X,
+  6, 6P, 9, Pixel C, and Player. </li>
+  <li> Review the <a href="{@docRoot}reference/packages.html">API Reference</a>
+  and <a href="{@docRoot}preview/samples.html">M Preview samples</a> to gain more
+  insight into new API features and how to use them in your app.
+  <li> Join the <a href="https://developer.android.com/preview/dev-community">Android N
+  Developer Community</a> to get the latest news and connect with other
+  developers working with the new platform.</li>
 </ol>
 
 <p>
   Thank you for your participation in the Android N Developer Preview program!
-</p>
+</p>
\ No newline at end of file
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
index 7f0e934..bdcbc89 100644
--- a/docs/html/preview/samples.jd
+++ b/docs/html/preview/samples.jd
@@ -1,6 +1,6 @@
 page.title=Samples
 page.tags="preview", "samples", "android"
-page.image=images/cards/samples-new_2x.png
+page.image=images/cards/card-n-samples_2x.png
 @jd:body
 
 <p>