diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index cb526fa..6ee0af0 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -386,15 +386,21 @@
 (for example, through calls to the
 {@link android.net.wifi.WifiManager#addNetwork(android.net.wifi.WifiConfiguration)
 addNetwork()} method) are now removed if that work profile is deleted.</li>
-<li><strong>WiFi configuration lockdown:</strong> Any WiFi configuration created by an active Device
-Owner can no longer be modified or deleted by the user. The user can still create and
-modify their own WiFi configurations, so long as the {@link android.os.UserManager} constant
-{@link android.os.UserManager#DISALLOW_CONFIG_WIFI} has not been set for that user.</li>
+
+<li><strong>WiFi configuration lockdown:</strong> Any WiFi configuration created by
+  an active Device Owner can no longer be modified or deleted by the user if
+  <code>Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN</code> is non-zero.
+  The user can still create and modify their own WiFi configurations. Active Device
+  Owners have the privilege of editing/removing any WiFi configurations, including
+  those not created by them.
+</li>
+
+</li>
 <li><strong>Download Work Policy Controller via Google account addition:</strong> When a Google
 account that requires management via a Work Policy Controller (WPC) app is added to a device
 outside of a managed context, the add account flow now prompts the user to install the
 appropriate WPC. This behavior also applies to accounts added via
-<strong>Settings > Accounts</strong> in the initial device setup wizard.</li>
+<strong>Settings > Accounts</strong> and in the initial device setup wizard.</li>
 <li><strong>Changes to specific DevicePolicyManager API behaviors:</strong>
   <ul>
   <li>Calling the {@link android.app.admin.DevicePolicyManager#setCameraDisabled(android.content.ComponentName,boolean) setCameraDisabled()}
@@ -412,10 +418,13 @@
     only affects notifications generated by applications in the managed profile.</li>
     </ul>
   </li>
-  <li>The {@link android.app.admin.DevicePolicyManager#createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle)} and {@link android.app.admin.DevicePolicyManager#createUser(android.content.ComponentName, java.lang.String) methods createAndInitializeUser have been deprecated.</li>
-    <li>Android for Work APIs are optimized for M runtime permssions, including Work profiles, assist layer, and others. DevicePolicyManager APIs support runtime permissions without affecting pre-M apps. </li>
+  <li>The {@link android.app.admin.DevicePolicyManager#createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle) createAndInitializeUser()} and {@link android.app.admin.DevicePolicyManager#createUser(android.content.ComponentName, java.lang.String) createUser()} methods have been deprecated.</li>
+  <li>The {@link android.app.admin.DevicePolicyManager#setScreenCaptureDisabled(android.content.ComponentName, boolean) setScreenCaptureDisabled()} method now also blocks the assist structure when an app of the given user is in the foreground. </li>
+  <li><code>EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM</code> now defaults to SHA-256. SHA-1 is still supported for backwards compatibility but will be removed in future. <code>EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM</code> now only accepts SHA-256.</li>
+  <li>Device initializer APIs which existed in the MNC preview are now removed. They will not appear in the final M release.</li>
+    <li>Android for Work APIs are optimized for M runtime permissions, including Work profiles, assist layer, and others. New DevicePolicyManager permission APIs don't affect pre-M apps.</li>
     </ul>
-    <li><strong>Changes to global settings</strong> &mdash; the settings below can no longer be set via <code>setGlobalSettings</code>:
+    <li><strong>Changes to global settings</strong> &mdash; the settings below can no longer be set via {@link android.app.admin.DevicePolicyManager#setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String) setGlobalSettings()}</code>:
 <ul>
     <li><code>BLUETOOTH_ON</code></li>
     <li><code>DEVELOPMENT_SETTINGS_ENABLED</code></li>
@@ -424,8 +433,4 @@
     <li><code>WIFI_ON</code></li> 
 </ul>
     </li>
-
-
-    </ul>
-
-
+</ul>
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 90da200..9c75008 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -58,7 +58,7 @@
         Build: MPZ79M<br>
         Hardware support: Nexus 5,6,9, Player<br>
         Emulator support: ARM 32/64-bit<br>
-        Google Play services: 7.5</em>
+        Google Play services: 7.6</em>
       </p>
     </div>
   </div>
@@ -129,7 +129,6 @@
         are updated to reflect latest permissions API changes, including
         <code>shouldShowRequestPermissionRationale()</code>.
       </li>
-
       <li>
         <a href=
         "https://github.com/googlesamples/android-FingerprintDialog">FingerprintDialog</a>
@@ -137,15 +136,6 @@
         well as a preference if the app will use fingerprints as a method of
         authentication.
       </li>
-
-      <li>The Android Wear samples (<a href=
-      "https://github.com/googlesamples/android-AgendaData">AgendaData</a> /
-      <a href=
-      "https://github.com/googlesamples/android-DataLayer">DataLayer</a> /
-      <a href="https://github.com/googlesamples/android-Quiz">Quiz</a> /
-      <a href="https://github.com/googlesamples/android-XYZTouristAttractions">
-        XYZTouristAttractions</a>) show a simplified usage of Data Items.
-      </li>
     </ul>
   </li>
 </ul>
@@ -246,24 +236,35 @@
 </h3>
 
 <ul>
-  <li>The system Messenger app crashes on the 64-bit emulator.
+  <li>General issues:
+    <ul>
+      <li>The system Messenger app crashes on the 64-bit emulator.</li>
+      <li>After updating to Developer Preview 2, Contacts sync experiences
+      intermittent issues. The workaround is to clear and re-sync Contact Storage
+      data after update. To clear data, go to <strong>Settings &gt; Apps &gt; Show
+      system &gt; Contacts Storage</strong>. Select "Storage" and then
+      <strong>Clear data</strong>.</li>
+      <li>In YouTube app, it's not possible to share a video. The share window is
+      blank.</li>
+      <li>Android For Work Profile setup is not working properly, so you won't be
+      able to create a new Work Profile after you update. As a workaround, make
+      sure to create the Work Profiles you need in Developer Preview 1 before
+      updating to Developer Preview 2.
+      </li>
+    </ul>
   </li>
-
-  <li>After updating to Developer Preview 2, Contacts sync experiences
-  intermittent issues. The workaround is to clear and re-sync Contact Storage
-  data after update. To clear data, go to <strong>Settings &gt; Apps &gt; Show
-  system &gt; Contacts Storage</strong>. Select "Storage" and then
-  <strong>Clear data</strong>.
-  </li>
-
-  <li>In YouTube app, it's not possible to share a video. The share window is
-  blank.
-  </li>
-
-  <li>Android For Work Profile setup is not working properly, so you won't be
-  able to create a new Work Profile after you update. As a workaround, make
-  sure to create the Work Profiles you need in Developer Preview 1 before
-  updating to Developer Preview 2.
+  <li>Issues specific to MPZ79N on Nexus Player:
+    <ul>
+      <li>Bluetooth share crashes after clearing data. Please <strong>do not
+      clear Bluetooth share data</strong>, otherwise you will need to Factory
+      Reset your device</li>
+      <li>There are issues with remote control connectivity. Remote can drop
+      from Bluetooth pairing when left idle. </li>
+      <li>Movies show black screen with some ANRs on exiting the video.</li>
+      <li>In YouTube app, lower-resolution videos have a green bar at the top
+      and some color-ghosting</li>
+      </li>
+    </ul>
   </li>
 </ul>