diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 9b3dbabecfc00..5ddac7a8eca16 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -50,20 +50,21 @@ some of the key changes that you should understand and account for in your apps.
   might be affected by these changes in the platform.</p>
 
 <h2 id="behavior-runtime-permissions">Runtime Permissions</h1>
-<p>This preview introduces a new runtime permissions model, where users can now directly manage
-their app permissions at runtime. This model gives users improved visibility and control over
+<p>This preview introduces a new permissions model, where users can now directly manage
+app permissions at runtime. This model gives users improved visibility and control over
 permissions, while streamlining the installation and auto-update processes for app developers.
-Users can set permissions on or off for all apps running on the M Preview. However, apps that
-don’t target the M Preview cannot request permissions at runtime.</p>
+Users can grant or revoke permissions individually for installed apps. </p>
 
 <p>On your apps that target the M Preview, make sure to check and request for permissions at
 runtime. To determine if your app has been granted a permission, call the
 new {@code Context.checkSelfPermission()} method. To request for a permission, call the new
-{@code Activity.requestPermission()} method.</p>
+{@code Activity.requestPermission()} method. Even if your app is not targeting M, you
+should test your app under the new permissions model.</p>
 
-<p>For more information on supporting the new permissions model in your app, see
+<p>For details on supporting the new permissions model in your app, see the
 <a href="{@docRoot}preview/features/runtime-permissions.html">
-Android M Preview Runtime Permissions</a>.</p>
+Permissions</a> developer preview page. For tips on how to assess the impact on your app,
+see the <a href="{@docRoot}preview/testing/guide.html#runtime-permissions">Testing Guide</a></p>
 
 <h2 id="behavior-power">Power-Saving Optimizations</h2>
 <p>This preview introduces new power-saving optimizations for idle devices and apps.</p>
@@ -103,6 +104,10 @@ high-priority messages. If your app receives high-priority GCM messages, it’s
 brief network access even when the device is in doze.
 </p>
 
+<p>See the
+<a href="{@docRoot}preview/testing/guide.html#doze-standby">Testing Guide</a> for tips on how
+to test Doze in your apps. </p>
+
 <h3 id="behavior-app-standby">App standby</h3>
 <p>With this preview, the system may determine that apps are idle when they are not in active
 use. Your app is considered idle after a period of time, unless the system detects
@@ -140,6 +145,10 @@ designate high-priority messages. If your app receives high-priority GCM message
 brief network access even when the app is idle.
 </p>
 
+<p>See the
+<a href="{@docRoot}preview/testing/guide.html#doze-standby">Testing Guide</a> for tips on how
+to test App Standby in your apps. </p>
+
 <h2 id="behavior-adoptable-storage">Adoptable Storage Devices</h2>
 <p>
 With this preview, users can <em>adopt</em> external storage devices such as SD cards. Adopting an
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index d6bafb1ed9f81..36b177d4a07a3 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -116,7 +116,7 @@ page.tags="preview", "developer", "android"
 <img src="{@docRoot}preview/images/m-preview-timeline-crop.png" alt=
 "Preview program timeline" id="timeline">
 <p>
-  The M Developer Preview runs from May 27 until the final Android M SDK, which
+  The M Developer Preview runs from May 28 until the final Android M SDK, which
   we’ll release shortly before the public release during Q3
   2015.
 </p>
@@ -326,7 +326,7 @@ page.tags="preview", "developer", "android"
 </p>
 
 <h2 id="get_started">
-  How to get started?
+  How to get started
 </h2>
 
 <p>
@@ -336,10 +336,12 @@ page.tags="preview", "developer", "android"
 <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.
+    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>Setup for testing and development by following the instructions for
+  <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>
diff --git a/docs/html/preview/testing/guide.jd b/docs/html/preview/testing/guide.jd
index 07a25a29744f3..56bb4d994476d 100644
--- a/docs/html/preview/testing/guide.jd
+++ b/docs/html/preview/testing/guide.jd
@@ -57,7 +57,7 @@ page.keywords=previewresources,androidm,testing,permissions
   app features from working, or they may work in a degraded state.
 </p>
 
-<p>
+<p class="caution">
   This change affects all apps running on the new platform, even those not targeting the new
   platform version. The platform provides a limited compatibility behavior for legacy apps, but you
   should begin planning your app’s migration to the new permissions model now, with a goal of