diff --git a/src/devices/tech/power/mgmt.jd b/src/devices/tech/power/mgmt.jd
index 16aed9d..c613215 100644
--- a/src/devices/tech/power/mgmt.jd
+++ b/src/devices/tech/power/mgmt.jd
@@ -269,8 +269,8 @@
 </li>
 <li>Confirm that preloaded apps and services:
 <ul>
-<li>Use the new
-<a href="https://developer.android.com/preview/behavior-changes.html#behavior-power">power-saving
+<li>Use the
+<a href="https://developer.android.com/training/monitoring-device-state/doze-standby.html">power-saving
 optimization guidelines</a>. For details, see <a href="#test-apps">Testing and
 optimizing applications</a>.
 <p><strong>OR</strong></p>
@@ -303,7 +303,7 @@
 <h4 id="test-apps">Testing and optimizing applications</h4>
 <p>Test all applications (especially preloaded applications) in Doze mode. For
 details, refer to
-<a href="https://developer.android.com/preview/testing/guide.html#doze-standby">Testing
+<a href="https://developer.android.com/training/monitoring-device-state/doze-standby.html#testing_doze_and_app_standby">Testing
 Doze and App Standby</a>.</p>
 
 <p class="note"><strong>Note</strong>: MMS/SMS/Telephony services function independently
diff --git a/src/source/jack.jd b/src/source/jack.jd
index b740749..f52003c 100644
--- a/src/source/jack.jd
+++ b/src/source/jack.jd
@@ -47,7 +47,7 @@
 <p class="note">Note that beginning in Android 7.0 (N), Jack supports code coverage with JaCoCo.
 See <a href="https://android.googlesource.com/platform/prebuilts/sdk/+/master/tools/README-jack-code-coverage.md">
 Code Coverage with JaCoCo</a> and <a href="https://developer.android.com/preview/j8-jack.html">
-Java 9 Language Features</a> for details.</p>
+Java 8 Language Features</a> for details.</p>
 
 <img src="{@docRoot}images/jack-overview.png" height="75%" width="75%" alt="Jack overview" />
 <p class="img-caption"><strong>Figure 1. </strong>Jack (Java Android Compiler Kit)</p>
@@ -70,9 +70,13 @@
 
 <h2 id=using_jack_in_your_android_build>Using Jack in your Android build</h2>
 
-<p>You don’t have to do anything differently to use Jack — just use your standard
-makefile commands to compile the tree or your project.  Jack is the default
-Android build toolchain for M.</p>
+<div class="note">For instructions on using Jack in Android 7.0 (N) and later, see the <a
+href="https://android.googlesource.com/platform/prebuilts/sdk/+/master/tools/README-jack-server.md">Jack
+server documentation</a>. For Android 6.0 (M), use the instructions in this section.</div>
+
+<p>You don’t have to do anything differently to use Jack — just use your
+standard makefile commands to compile the tree or your project.  Jack is the
+default Android build toolchain for M.</p>
 
 <p>The first time Jack is used, it launches a local Jack compilation server on
 your computer:</p>