Merge "Docs: Changes to source.android.com" am: 120d2f767c am: a63d33d0bd

am: 1985904be8

Change-Id: If48edfc56f2779c0f211a751938080c2d9aa0e39

27 files changed, 222 insertions, 80 deletions

diff --git a/en/_index.yaml b/en/_index.yaml
index a98b6a03..c9bc4170 100644
--- a/en/_index.yaml
+++ b/en/_index.yaml
@@ -55,6 +55,14 @@ landing_page:
       image_path: /images/android_stack.png
   - heading: News
     items:
+    - heading: April Android Security Bulletin
+      description: >
+        The April 2017 Android Security Bulletin has been published along with
+        links to associated fixes and new build numbers to support the April
+        Android security release.
+      buttons:
+      - label: April 6th, 2017
+        path: /security/bulletin/2017-04-01
     - heading: Complete Site Redesign
       description: >
         This site has been overhauled to make it easier for you to navigate,
@@ -71,14 +79,6 @@ landing_page:
       buttons:
       - label: March 21st, 2017
         path: http://static.googleusercontent.com/media/source.android.com/en//security/reports/Google_Android_Security_2016_Report_Final.pdf
-    - heading: March Android Security Bulletin
-      description: >
-        The March 2017 Android Security Bulletin has been published along with
-        links to associated fixes and new build numbers to support the March
-        Android security release.
-      buttons:
-      - label: March 7th, 2017
-        path: /security/bulletin/2017-03-01
   - classname: devsite-landing-row-100 tf-row-centered
     items:
     - buttons:
diff --git a/en/compatibility/cts/audio-framework.html b/en/compatibility/cts/audio-framework.html
index 626f990d..81d69a75 100644
--- a/en/compatibility/cts/audio-framework.html
+++ b/en/compatibility/cts/audio-framework.html
@@ -46,25 +46,25 @@ instructions.</p>
 <table>
  <tr>
     <td width="50%">Start CTS Verifier Loopback Test</td>
-    <td width="50%"><img src="images/audio-framework0.png" alt="audio latency loopback" width="300"
+    <td width="50%"><img src="/compatibility/cts/images/audio-framework0.png" alt="audio latency loopback" width="300"
         id="audio_latency_loopback" /></td>
  </tr>
  <tr>
     <td>Summary of instructions is displayed</td>
-    <td><img src="images/audio-framework1.png" alt="summary of instructions" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework1.png" alt="summary of instructions" width="300"
         id="loopback_instructions" /></td>
  </tr>
  <tr>
     <td>Report if the device has a headset port:<br>
         <strong>YES</strong> if the device under test has a physical headset port<br>
         <strong>NO</strong> if there is no headset port</td>
-    <td><img src="images/audio-framework-port.png" alt="audio loopback latency" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-port.png" alt="audio loopback latency" width="300"
         id="port_check" /></td>
  </tr>
  <tr>
     <td>If the answer was <strong>NO</strong> in the previous step, press
         <strong>Pass</strong> (green check) on the bottom of the test and finish</td>
-    <td><img src="images/audio-framework-pass.png" alt="audio pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-pass.png" alt="audio pass button" width="300"
         id="port_pass" /></td>
  </tr>
  <tr>
@@ -72,36 +72,36 @@ instructions.</p>
          to connect loopback plug.<br>
          Connect a loopback plug to the headset port<br>
          Press the <strong>Loopback Plug Ready</strong> button
-    <td><img src="images/audio-framework2.png" alt="audio pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework2.png" alt="audio pass button" width="300"
         id="port_pass" /></td>
  </tr>
  <tr>
     <td>Move the slider until the signal level is greater than 60%<br>
         Press <strong>TEST</strong></td>
-    <td><img src="images/audio-framework3.png" alt="audio level 1" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework3.png" alt="audio level 1" width="300"
         id="audio_level1" />
-        <img src="images/audio-framework4.png" alt="audio level 2" width="300"
+        <img src="/compatibility/cts/images/audio-framework4.png" alt="audio level 2" width="300"
         id="audio_level2"></td>
  </tr>
  <tr>
     <td>Wait several seconds while the latency test is performed</td>
-    <td><img src="images/audio-framework5.png" alt="test running" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework5.png" alt="test running" width="300"
         id="test_running" /></td>
  </tr>
  <tr>
     <td>When the test is finished, results are shown<br>
         The minimum confidence level for a test to succeed is 0.6<br>
         Lower latency numbers are preferred, but no number is enforced</td>
-    <td><img src="images/audio-framework6.png"  alt="test finished" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework6.png"  alt="test finished" width="300"
         id="test_finished" />
 </td>
  </tr>
  <tr>
     <td>Press the <strong>Pass</strong> (green, only available if successful) or
 <strong>Failed</strong> (red) button to record the results.</td>
-    <td><img src="images/audio-framework7.png" alt="Pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework7.png" alt="Pass button" width="300"
         id="pass_button" /><br>
-        <img src="images/audio-framework8.png" alt="Failed button" width="300"
+        <img src="/compatibility/cts/images/audio-framework8.png" alt="Failed button" width="300"
         id="failed_button" /></td>
  </tr>
 </table>
@@ -117,25 +117,25 @@ applied per channel.</p>
 <table>
  <tr>
     <td width="50%">Start CTS Audio Frequency Line Test</td>
-    <td width="50%"><img src="images/audio-framework9.png" alt="start frequency line" width="300"
+    <td width="50%"><img src="/compatibility/cts/images/audio-framework9.png" alt="start frequency line" width="300"
         id="start_line_test" /></td>
  </tr>
  <tr>
     <td>Summary of instructions is displayed</td>
-    <td><img src="images/audio-framework10.png" alt="instructions" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework10.png" alt="instructions" width="300"
         id="summary_instructions" /></td>
  </tr>
  <tr>
     <td>Report if the device has a headset port:<br>
         <strong>YES</strong> if the device under test has a physical headset port<br>
         <strong>NO</strong> if there is no headset port</td>
-    <td><img src="images/audio-framework-line-port.png" alt="audio frequency line" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-line-port.png" alt="audio frequency line" width="300"
         id="line_port_check" /></td>
  </tr>
  <tr>
     <td>If the answer was <strong>NO</strong> in the previous step, press
         <strong>Pass</strong> (green check) on the bottom of the test and finish</td>
-    <td><img src="images/audio-framework-pass.png" alt="audio pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-pass.png" alt="audio pass button" width="300"
         id="port_pass" /></td>
  </tr>
  <tr>
@@ -144,28 +144,28 @@ applied per channel.</p>
 	 Connect a Loopback Plug to the headset connector (see <a
          href="#loopback_latency">Loopback plug latency test</a>)<br>
          Press the <strong>Loopback Plug Ready</strong> button
-    <td><img src="images/audio-framework11.png" alt="loopback plug ready" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework11.png" alt="loopback plug ready" width="300"
         id="port_pass" /></td>
  </tr>
     <td>Press <strong>TEST</strong></td>
-    <td><img src="images/audio-framework12.png" alt="loopback plug test" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework12.png" alt="loopback plug test" width="300"
         id="loopback_plug_test" /></td>
  </tr>
  <tr>
     <td>Wait several seconds while the frequency tests are performed</td>
-    <td><img src="images/audio-framework13.png" alt="testing left capture" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework13.png" alt="testing left capture" width="300"
         id="left_capture" /></td>
  </tr>
  <tr>
     <td>When the test is finished, results are shown</td>
-    <td><img src="images/audio-framework14.png" alt="testing complete" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework14.png" alt="testing complete" width="300"
         id="test_complete" /></td>
  </tr>
     <td>Press the <strong>Pass</strong> (only available if successful) or
         <strong>Failed</strong> button to record the results</td>
-    <td><img src="images/audio-framework15.png" alt="Pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework15.png" alt="Pass button" width="300"
         id="pass_button" /><br>
-        <img src="images/audio-framework16.png" alt="Failed button" width="300"
+        <img src="/compatibility/cts/images/audio-framework16.png" alt="Failed button" width="300"
         id="failed_button" /></td>
  </tr>
 </table>
@@ -193,48 +193,48 @@ Flat Frequency response on range 100 Hz - 20 kHz:  +/- 2 dB<br>
 <table>
  <tr>
     <td width="50%">Start CTS Audio Frequency Speaker Test</td>
-    <td width="50%"><img src="images/audio-framework17.png" alt="start speaker test" width="300"
+    <td width="50%"><img src="/compatibility/cts/images/audio-framework17.png" alt="start speaker test" width="300"
         id="start_speaker" /></td>
  </tr>
  <tr>
     <td>Summary of instructions is displayed</td>
-    <td><img src="images/audio-framework18.png" alt="instructions" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework18.png" alt="instructions" width="300"
         id="summary_instructions" /></td>
  </tr>
  <tr>
     <td>Connect a USB reference microphone (see <a
         href="#audio_frequency_speaker_test">Audio frequency speaker test</a>)<br>
         Press <strong>USB REFERENCE MICROPHONE READY</strong></td>
-    <td><img src="images/audio-framework19.png"  alt="mic ready" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework19.png"  alt="mic ready" width="300"
         id="mic_ready" /></td>
  </tr>
  <tr>
     <td>Set up DUT (Device Under Test) in a quiet room and USB microphone 20cms
 perpendicular to center of screen</td>
-    <td><img src="images/audio-framework20.png" alt="device under test" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework20.png" alt="device under test" width="300"
         id="dut" /></td>
  </tr>
  <tr>
     <td>Press <strong>TEST</strong></td>
-    <td><img src="images/audio-framework21.png" alt="click test" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework21.png" alt="click test" width="300"
         id="click_test" /></td>
  </tr>
  <tr>
     <td>Wait several seconds while the frequency tests are performed</td>
-    <td><img src="images/audio-framework22.png" alt="test underway" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework22.png" alt="test underway" width="300"
         id="right_capture" /></td>
  </tr>
  <tr>
     <td>When the test is finished, results are shown</td>
-    <td><img src="images/audio-framework23.png" alt="test complete" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework23.png" alt="test complete" width="300"
         id="test_complete" /></td>
  </tr>
  </tr>
     <td>Press the <strong>Pass</strong> (only available if successful) or
         <strong>Failed</strong> button to record the results</td>
-    <td><img src="images/audio-framework24.png" alt="Pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework24.png" alt="Pass button" width="300"
         id="pass_button" /><br>
-        <img src="images/audio-framework25.png" alt="Failed button" width="300"
+        <img src="/compatibility/cts/images/audio-framework25.png" alt="Failed button" width="300"
         id="failed_button" /></td>
  </tr>
 </table>
@@ -258,12 +258,12 @@ have a solid reference to compare the built in microphone against.</p>
 <table>
  <tr>
     <td width="50%">Start CTS Audio Frequency Microphone Test</td>
-    <td width="50%"><img src="images/audio-framework26.png" alt="start mic test" width="300"
+    <td width="50%"><img src="/compatibility/cts/images/audio-framework26.png" alt="start mic test" width="300"
         id="start_mic_test" /></td>
  </tr>
  <tr>
     <td>Summary of instructions is displayed</td>
-    <td><img src="images/audio-framework27.png" alt="instructions" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework27.png" alt="instructions" width="300"
         id="summary_instructions" /></td>
  </tr>
  <tr>
@@ -271,20 +271,20 @@ have a solid reference to compare the built in microphone against.</p>
         Position the speakers 40cm perpendicular to the center of the screen
         of the DUT (see <a href="#audio_frequency_microphone_test">Audio
         frequency microphone test </a>)</td>
-    <td><img src="images/audio-framework28.png" alt="device under test" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework28.png" alt="device under test" width="300"
         id="device_position" /></td>
  </tr>
  <tr>
     <td>Report if the device has a headset port:<br>
         <strong>YES</strong> if the device under test has a physical headset port<br>
         <strong>NO</strong> if there is no headset port</td>
-    <td><img src="images/audio-framework-mic-port.png" alt="audio microphone test" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-mic-port.png" alt="audio microphone test" width="300"
         id="mic_port_check" /></td>
  </tr>
  <tr>
     <td>If the answer was <strong>NO</strong> in the previous step, press
         <strong>Pass</strong> (green check) on the bottom of the test and finish</td>
-    <td><img src="images/audio-framework-pass.png" alt="mic headset pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework-pass.png" alt="mic headset pass button" width="300"
         id="mic_port_pass" /></td>
  </tr>
  <tr>
@@ -293,22 +293,22 @@ have a solid reference to compare the built in microphone against.</p>
         Connect external speakers using the headphone/line out connector
         (remember to unplug any USB microphone)<br>
         Press <strong>EXTERNAL SPEAKERS READY</strong></td>
-    <td><img src="images/audio-framework29.png" alt="external speakers ready" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework29.png" alt="external speakers ready" width="300"
         id="speakers_ready" /></td>
  </tr>
  <tr>
     <td>Press <strong>TEST 1</strong></td>
-    <td><img src="images/audio-framework30.png" alt="no USB device" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework30.png" alt="no USB device" width="300"
         id="no_usb_device" /></td>
  </tr>
  <tr>
     <td>Wait several seconds for test 1 to complete.</td>
-    <td><img src="images/audio-framework31.png" alt="testing underway" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework31.png" alt="testing underway" width="300"
         id="testing_incomplete" /></td>
  </tr>
  <tr>
     <td>When test 1 is completed, results for the built in microphone are shown.</td>
-    <td><img src="images/audio-framework32.png" alt="test results" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework32.png" alt="test results" width="300"
         id="testing_complete" /></td>
  </tr>
  <tr>
@@ -316,42 +316,186 @@ have a solid reference to compare the built in microphone against.</p>
         href="#audio_frequency_speaker_test">Audio frequency speaker test
         </a>)<br>
         Press <strong>USB REFERENCE MICROPHONE READY</strong></td>
-    <td><img src="images/audio-framework33.png" alt="microphone ready" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework33.png" alt="microphone ready" width="300"
         id="mic_ready" /></td>
  </tr>
  <tr>
     <td>Position USB microphone right next to built-in microphone in DUT,
         pointing towards external speakers</td>
-    <td><img src="images/audio-framework34.jpg" alt="device position" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework34.jpg" alt="device position" width="300"
         id="device_position" /><br>
-        <img src="images/audio-framework35.png" alt="mic position" width="300"
+        <img src="/compatibility/cts/images/audio-framework35.png" alt="mic position" width="300"
         id="mic-position" /></td>
  </tr>
  <tr>
     <td>Press <strong>TEST 2</strong></td>
-    <td><img src="images/audio-framework36.png" alt="USB detected" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework36.png" alt="USB detected" width="300"
         id="usb-detected" /></td>
  </tr>
  <tr>
     <td>Wait several seconds while the test 2 runs</td>
-    <td><img src="images/audio-framework37.png" alt="test running" width="132"
+    <td><img src="/compatibility/cts/images/audio-framework37.png" alt="test running" width="132"
         id="test_running" /></td>
  </tr>
  <tr>
     <td>When test 2 is completed, results for the USB reference microphone are
         shown.</td>
-    <td><img src="images/audio-framework38.png" alt="testing completed" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework38.png" alt="testing completed" width="300"
         id="testing_completed" /></td>
  </tr>
  <tr>
     <td>Press the <strong>Pass</strong> (only available if successful) or
 <strong>Failed</strong> button to record the results.</td>
-    <td><img src="images/audio-framework39.png" alt="Pass button" width="300"
+    <td><img src="/compatibility/cts/images/audio-framework39.png" alt="Pass button" width="300"
         id="pass_button" /><br>
-        <img src="images/audio-framework40.png" alt="Failed button" width="300"
+        <img src="/compatibility/cts/images/audio-framework40.png" alt="Failed button" width="300"
         id="failed_button" /></td>
  </tr>
 </table>
 
+<h2>Audio Frequency Unprocessed Test</h2>
+<p>
+For this test, in addition to the USB reference microphone and external
+speakers, it is necessary to have access to a Sound Pressure Level Meter (SPL
+Meter).
+</p>
+<p>
+Also worth mentioning, in this test the Playback and Test parts of each test
+have been given their own button. This was done to help test certain devices
+which don't have easy playback capabilities, but still can test the recording
+source UNPROCESSED.
+</p>
+<table>
+  <tr>
+   <td width="50%">Start CTS Frequency Unprocessed Test.
+   </td>
+   <td width="50%">
+<img src="/compatibility/cts/images/audio-framework41.png" alt="Start test" title="Start test">
+   </td>
+  </tr>
+  <tr>
+   <td>Summary of instructions is displayed.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework42.png" alt="Summary of instructions" title="Summary of instructions">
+   </td>
+  </tr>
+  <tr>
+    <td>Set up DUT in a quiet room.
+Connect external speakers using the
+headphone/line out connector (make sure there is not any USB microphone
+connected).
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework43.jpg" alt="Photo of DUT setup" title="DUT setup">
+   </td>
+  </tr>
+  <tr>
+    <td>TEST TONE<br>
+Press [PLAY] and move the SPL meter on front of the speakers
+until the level read is 94 dB SPL.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework44.jpg" alt="Photo of test tone setup" title="TEST TONE setup">
+   </td>
+  </tr>
+  <tr>
+   <td>Move the SPL meter in a straight line from the speakers back and forth,
+until the level read on the screen is 94 dB SPL. Make a note of this location.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework45.jpg" alt="Photo of SPL meter placement" title="SPL meter placement">
+   </td>
+  </tr>
+  <tr>
+   <td>Move the DUT and place the microphone in about the same location found
+in the previous step.
+Press [TEST].
+The DUT performs a short audio capture
+and automatically stops the playback.
+Playback can also be stopped by pressing
+[STOP] if needed.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework46.png" alt="Screenshot of audio capture" title="Audio Capture">
+   </td>
+  </tr>
+  <tr>
+    <td>TEST NOISE<br>
+Position the speakers 40cm perpendicular to the center of the
+screen of the DUT (see <a href="#audio_frequency_microphone_test">Audio frequency microphone test</a>).
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework47.png" alt="Photo of speaker placement" title="Speaker placement">
+   </td>
+  </tr>
+  <tr>
+   <td>Press [PLAY].
+Press [TEST].
+Wait for the test to complete. It will
+automatically stop the plabyack.
+<p>
+Playback can also be stopped by pressing [STOP] if needed.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework48.png" alt="Screenshot of running test" title="Running test">
+   </td>
+  </tr>
+  <tr>
+    <td>TEST USB BACKGROUND<br>
+      Connect a USB Reference microphone (see <a href="#audio_frequency_speaker_test">Audio
+        frequency speaker test</a>).
+Locate USB microphone close to DUT microphone
+<p>
+Press [TEST].
+<p>
+This runs a short test and displays results on screen.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework49.jpg" alt="Photo of USB refernce mike" title="USB reference mike">
+<img src="/compatibility/cts/images/audio-framework50.png" alt="Screenshot of running test" title="Running test">
+   </td>
+  </tr>
+  <tr>
+    <td>TEST USB NOISE<br>
+Leave USB microphone in the same position as in the previous
+test.
+<p>
+Press [PLAY].
+Broadband noise should play from external speakers.
+Press [TEST].
+A short test will run and display results on screen.
+   </td>
+   <td>.
+<img src="/compatibility/cts/images/audio-framework51.png" alt="Screenshot of USB noise test" title="USB noise test">
+   </td>
+  </tr>
+  <tr>
+   <td>When the 4 parts of the test are completed, the global results are
+updated with PASSED/FAILED information for each test.
+
+If needed, repeat
+individual steps of the test.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework52.png" alt="Test results" title="Test results">
+   </td>
+  </tr>
+  <tr>
+   <td>Press the Pass (only available if successful) or Failed button to record
+the results.
+If the DUT does not define the Audio Frequency Unprocessed feature,
+running the test is required, but success in all measurements is not mandatory.
+   </td>
+   <td>
+<img src="/compatibility/cts/images/audio-framework53.png" alt="Test passed" title="Test passed">
+<p>
+<img src="/compatibility/cts/images/audio-framework54.png" alt="Test not passed" title="Test not passed">
+   </td>
+  </tr>
+</table>
+
+
+
   </body>
 </html>
diff --git a/en/compatibility/cts/images/audio-framework41.png b/en/compatibility/cts/images/audio-framework41.png
new file mode 100644
index 00000000..360809b7
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework41.png
diff --git a/en/compatibility/cts/images/audio-framework42.png b/en/compatibility/cts/images/audio-framework42.png
new file mode 100644
index 00000000..d24b25b5
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework42.png
diff --git a/en/compatibility/cts/images/audio-framework43.jpg b/en/compatibility/cts/images/audio-framework43.jpg
new file mode 100644
index 00000000..c8adbf15
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework43.jpg
diff --git a/en/compatibility/cts/images/audio-framework44.jpg b/en/compatibility/cts/images/audio-framework44.jpg
new file mode 100644
index 00000000..91305f5e
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework44.jpg
diff --git a/en/compatibility/cts/images/audio-framework45.jpg b/en/compatibility/cts/images/audio-framework45.jpg
new file mode 100644
index 00000000..4ff262f8
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework45.jpg
diff --git a/en/compatibility/cts/images/audio-framework46.png b/en/compatibility/cts/images/audio-framework46.png
new file mode 100644
index 00000000..1688fc40
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework46.png
diff --git a/en/compatibility/cts/images/audio-framework47.png b/en/compatibility/cts/images/audio-framework47.png
new file mode 100644
index 00000000..79514429
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework47.png
diff --git a/en/compatibility/cts/images/audio-framework48.png b/en/compatibility/cts/images/audio-framework48.png
new file mode 100644
index 00000000..f5454612
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework48.png
diff --git a/en/compatibility/cts/images/audio-framework49.jpg b/en/compatibility/cts/images/audio-framework49.jpg
new file mode 100644
index 00000000..604b7f08
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework49.jpg
diff --git a/en/compatibility/cts/images/audio-framework50.png b/en/compatibility/cts/images/audio-framework50.png
new file mode 100644
index 00000000..29f74a0f
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework50.png
diff --git a/en/compatibility/cts/images/audio-framework51.png b/en/compatibility/cts/images/audio-framework51.png
new file mode 100644
index 00000000..9cb5f9ba
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework51.png
diff --git a/en/compatibility/cts/images/audio-framework52.png b/en/compatibility/cts/images/audio-framework52.png
new file mode 100644
index 00000000..6809aa42
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework52.png
diff --git a/en/compatibility/cts/images/audio-framework53.png b/en/compatibility/cts/images/audio-framework53.png
new file mode 100644
index 00000000..a46d6061
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework53.png
diff --git a/en/compatibility/cts/images/audio-framework54.png b/en/compatibility/cts/images/audio-framework54.png
new file mode 100644
index 00000000..47d0dac3
--- /dev/null
+++ b/en/compatibility/cts/images/audio-framework54.png
diff --git a/en/devices/accessories/headset/expected-behavior.html b/en/devices/accessories/headset/expected-behavior.html
index a49644f0..3f4cf874 100644
--- a/en/devices/accessories/headset/expected-behavior.html
+++ b/en/devices/accessories/headset/expected-behavior.html
@@ -28,7 +28,7 @@ This article details the functional requirements for
 <a href="plug-headset-spec.html">3.5 mm plug</a> and
 <a href="usb-headset-spec.html">USB</a> headsets.</p>
 <p>
-When verifying the behaviors of the device and the audio headset, note that the
+When verifying the behaviors of the device and the audio headset, note these
 requirements:</p>
 <ul>
   <li>only apply when no other audio accessories (e.g. Bluetooth) are
diff --git a/en/devices/tech/index.html b/en/devices/tech/index.html
index 04ac7d92..45567c7e 100644
--- a/en/devices/tech/index.html
+++ b/en/devices/tech/index.html
@@ -87,7 +87,7 @@ information</a></p>
 <p>Android's Hardware Abstraction Layer (HAL) provides the interface between
 software APIs and hardware drivers. This section contains the commented code
 files of the HAL.</p>
-<p><a href="/devices/halref/files.html">&raquo; HAL Reference</a></p>
+<p><a href="/reference/hal/">&raquo; HAL Reference</a></p>
 
 <h2 id="ota-technical-information">OTA Updates</h2>
 <p>Android devices in the field can receive and install over-the-air (OTA)
diff --git a/en/devices/tech/test_infra/tradefed/fundamentals/index.html b/en/devices/tech/test_infra/tradefed/fundamentals/index.html
index b6f7d389..f4d83f1b 100644
--- a/en/devices/tech/test_infra/tradefed/fundamentals/index.html
+++ b/en/devices/tech/test_infra/tradefed/fundamentals/index.html
@@ -75,7 +75,7 @@ things that aren't directly discussed in the documentation.</p>
 
 <p>If you've gotten through everything here and still have unanswered questions, first try taking
 a look at the <a href="https://android.googlesource.com/platform/tools/tradefederation/+/master"
->Trade Federation source code.</a>.  Beyond that, feel free to try asking on the
+>Trade Federation source code</a>.  Beyond that, feel free to try asking on the
 <a href="/source/community.html">android-platform</a> Google Group.  For best results, make
 sure to mention "Trade Federation" (or "tradefed", or "TF") in the message subject.</p>
 
diff --git a/en/devices/tech/test_infra/tradefed/fundamentals/lifecycle.html b/en/devices/tech/test_infra/tradefed/fundamentals/lifecycle.html
index baf53813..f5c836d1 100644
--- a/en/devices/tech/test_infra/tradefed/fundamentals/lifecycle.html
+++ b/en/devices/tech/test_infra/tradefed/fundamentals/lifecycle.html
@@ -27,10 +27,10 @@
 around formally defined interfaces.</p>
 <ul>
 <li><a href="/reference/com/android/tradefed/build/IBuildProvider.html"
-  >Build Provider</a>: Provides a build to test, downloading appropriate files if necessary</li>
+  >Build Provider</a>: Provides a build to test, downloading appropriate files if necessary.</li>
 <li><a href="/reference/com/android/tradefed/targetprep/ITargetPreparer.html"
   >Target Preparer</a>: Prepares the test environment, possibly including software installation and
-  device configuration</li>
+  device configuration.</li>
 <li><a href="/reference/com/android/tradefed/testtype/IRemoteTest.html"
   >Test</a>: Executes test(s) and gathers test results.  This may be any JUnit Test, although our
   <a href="/reference/com/android/tradefed/testtype/IRemoteTest.html"
@@ -38,7 +38,7 @@ around formally defined interfaces.</p>
   environment.</li>
 <li><a href="/reference/com/android/tradefed/result/ITestInvocationListener.html"
   >Test Invocation Listener</a>: Listens for test results, usually for the purpose of forwarding the
-  test results to a repository or displaying them to the Test Runner</li>
+  test results to a repository or displaying them to the Test Runner.</li>
 </ul>
 
 <p>The fundamental testing entity in TF is a <b>Configuration</b> (config). A config is an XML file
@@ -60,8 +60,8 @@ In short, an Invocation encompasses a complete TF test execution, across its ent
 <h3>Additional Components of a Configuration</h3>
 <ul>
 <li><a href="/reference/com/android/tradefed/device/IDeviceRecovery.html"
-  >Device Recovery</a>: mechanism to recover device communication if lost</li>
-<li><a href="/reference/com/android/tradefed/log/package-summary.html">Logger</a>: collects tradefed logging data</li>
+  >Device Recovery</a>: mechanism to recover device communication if lost.</li>
+<li><a href="/reference/com/android/tradefed/log/package-summary.html">Logger</a>: collects tradefed logging data.</li>
 </ul>
 
 
diff --git a/en/devices/tech/test_infra/tradefed/index.html b/en/devices/tech/test_infra/tradefed/index.html
index f77c4df9..2901f67d 100644
--- a/en/devices/tech/test_infra/tradefed/index.html
+++ b/en/devices/tech/test_infra/tradefed/index.html
@@ -100,7 +100,7 @@ build of the application.</p>
 <p>A Test Service might, for instance, allow app developers to submit apps and run tests on devices
 instrumented with power-measurement tools to determine power usage for the app.  This differs from
 the prior two usecases in that the service builder does not control the devices or the applications
-that are being run</p>
+that are being run.</p>
 
 <p>Because Trade Federation can run any Java class that implements the simple
 <a href="/reference/com/android/tradefed/testtype/IRemoteTest.html"><code>IRemoteTest</code></a> interface, it's
diff --git a/en/security/bulletin/2016-04-02.html b/en/security/bulletin/2016-04-02.html
index eb8984be..a63a6387 100644
--- a/en/security/bulletin/2016-04-02.html
+++ b/en/security/bulletin/2016-04-02.html
@@ -119,7 +119,7 @@ Team: CVE-2016-0834, CVE-2016-0841, CVE-2016-0840, CVE-2016-0839, CVE-2016-0838
   <li> Peter Pi (<a href="https://twitter.com/heisecode">@heisecode</a>)
   of Trend Micro: CVE-2016-2418, CVE-2016-2413, CVE-2016-2419
   <li> Richard Shupak: CVE-2016-2415
-  <li> Romain Trouvé (<a href="https://twitter.com/bouuntyyy">@bouuntyyy)</a> of
+  <li> Romain Trouvé of
   <a href="https://labs.mwrinfosecurity.com/">MWR Labs</a>: CVE-2016-0850
   <li> Stuart Henderson: CVE-2016-2422
   <li> Vishwath Mohan of Android Security: CVE-2016-2424
diff --git a/en/security/bulletin/2016-05-01.html b/en/security/bulletin/2016-05-01.html
index 09404286..95c16966 100644
--- a/en/security/bulletin/2016-05-01.html
+++ b/en/security/bulletin/2016-05-01.html
@@ -639,7 +639,7 @@ the driver, it is rated as High severity.</p>
 latest binary drivers for Nexus devices available from the
 <a href="https://developers.google.com/android/nexus/drivers">Google Developer site</a>.</p>
 
-<h3 id=elevation_of_privilege_vulnerability_in_qualcomm_wi-fi_driver>
+<h3 id=eop_in_qualcomm_wi-fi_driver>
 Elevation of Privilege Vulnerability in Qualcomm Wi-Fi Driver</h3>
 
 
@@ -676,7 +676,7 @@ permissions privileges, which are not accessible to a third-party application.</
 latest binary drivers for Nexus devices available from the
 <a href="https://developers.google.com/android/nexus/drivers">Google Developer site</a>.</p>
 
-<h3 id=elevation_of_privilege_vulnerability_in_nvidia_video_driver>
+<h3 id=eop_in_nvidia_video_driver>
 Elevation of Privilege Vulnerability in NVIDIA Video Driver</h3>
 
 
@@ -724,7 +724,7 @@ to call the driver, it is rated High severity.</p>
 latest binary drivers for Nexus devices available from the
 <a href="https://developers.google.com/android/nexus/drivers">Google Developer site</a>.</p>
 
-<h3 id=elevation_of_privilege_vulnerability_in_wi-fi>
+<h3 id=eop_in_wi-fi>
 Elevation of Privilege Vulnerability in Wi-Fi</h3>
 
 
@@ -994,7 +994,7 @@ configuration, it is rated as Moderate severity.</p>
 </table>
 
 
-<h3 id=elevation_of_privilege_vulnerability_in_mediatek_wi-fi_driver>
+<h3 id=eop_in_mediatek_wi-fi_driver>
 Elevation of Privilege Vulnerability in MediaTek Wi-Fi Driver</h3>
 
 
@@ -1192,7 +1192,7 @@ manufacturers that include these updates should set the patch string level to:
 <p id="nexus_devices"><strong>2. How do I determine which Nexus devices are affected
 by each issue?</strong></p>
 
-<p>In the <a href="security_vulnerability_details">Security Vulnerability Details</a>
+<p>In the <a href="#security_vulnerability_details">Security Vulnerability Details</a>
 section, each table has an Updated Nexus devices column that covers the range
 of affected Nexus devices updated for each issue. This column has a few
 options:</p>
diff --git a/en/security/encryption/file-based.html b/en/security/encryption/file-based.html
index dd4e3b5a..d493b390 100644
--- a/en/security/encryption/file-based.html
+++ b/en/security/encryption/file-based.html
@@ -412,7 +412,7 @@ Within this folder create a directory to contain the OTA packages.
 <h2 id="validation">Validation</h2>
 <p>
 To ensure the implemented version of the feature works as intended, employ the
-many <a href="://android.googlesource.com/platform/cts/+/nougat-cts-release/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java">
+many <a href="https://android.googlesource.com/platform/cts/+/nougat-cts-release/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java">
 CTS encryption tests</a>.
 </p>
 <p>
diff --git a/en/security/overview/acknowledgements.html b/en/security/overview/acknowledgements.html
index 53c02356..fd84ebd0 100644
--- a/en/security/overview/acknowledgements.html
+++ b/en/security/overview/acknowledgements.html
@@ -519,7 +519,7 @@ Tesla Motors Product Security Team</p>
 
 <p>Roeland Krak</p>
 
-<p>Romain Trouvé (<a href="https://twitter.com/bouuntyyy">@bouuntyyy)</a> of
+<p>Romain Trouvé of
  <a href="https://labs.mwrinfosecurity.com/">MWR Labs</a></p>
 
 <p>Ronald L. Loor Vargas (<a href="https://twitter.com/loor_rlv">@loor_rlv</a>)
@@ -759,7 +759,8 @@ Austria/Hagenberg</p>
 
 <p>Seven Shen of Trend Micro</p>
 
-<p><a href="http://www.ec-spride.tu-darmstadt.de/en/research-groups/secure-software-engineering-group/staff/siegfried-rasthofer/">Siegfried Rasthofer</a> of <a href="http://sseblog.ec-spride.de/">Secure Software Engineering Group</a>, EC SPRIDE Technische Universität</p>
+<p>Siegfried Rasthofer of <a href="https://blogs.uni-paderborn.de/sse/">
+Secure Software Engineering Group</a>, EC SPRIDE Technische Universität</p>
 
 <p>Stephan Huber of Testlab Mobile Security, <a href="https://www.sit.fraunhofer.de/">Fraunhofer SIT</a> (Stephan.Huber@sit.fraunhofer.de)</p>
 
@@ -818,7 +819,7 @@ alt="Green Droid Patch Symbol"
 title="This person contributed code that improved Android security">
 </a></p>
 
-<p>Jeff Forristal of <a href="http://www.bluebox.com/blog/">Bluebox
+<p>Jeff Forristal of <a href="http://www.bluebox.com/">Bluebox
 Security</a></p>
 
 <p><a href="http://blog.redfern.me/">Joseph Redfern</a> of <a
@@ -854,9 +855,7 @@ title="This person contributed code that improved Android security"></a></p>
 
 <p>Sebastian Brenza</p>
 
-<p><a
-href="http://www.ec-spride.tu-darmstadt.de/en/research-groups/secure-software-engineering-group/staff/siegfried-rasthofer/">Siegfried
-Rasthofer</a> of <a href="http://sseblog.ec-spride.de/">Secure Software
+<p>Siegfried Rasthofer of <a href="https://blogs.uni-paderborn.de/sse/">Secure Software
 Engineering Group</a>, EC SPRIDE Technische Universität Darmstadt (<a
 href="mailto:siegfried.rasthofer@gmail.com">siegfried.rasthofer@gmail.com</a>)</p>
 
diff --git a/en/security/overview/implement.html b/en/security/overview/implement.html
index 36083ac8..bbe1967c 100644
--- a/en/security/overview/implement.html
+++ b/en/security/overview/implement.html
@@ -36,8 +36,7 @@ details unique to building or installing system-level software on devices.</p>
 
 <p>To facilitate adoption of these best practices, where possible the Android
 Security Team incorporates tests into the
-<a href="/compatibility/cts-intro.html">Android Compatibility Test
-Suite</a> (CTS) and
+<a href="/compatibility/cts">Android Compatibility Test Suite</a> (CTS) and
 <a href="http://tools.android.com/tips/lint">Android Lint</a>. We encourage
 device implementers to contribute tests that can help other Android users (view
 security-related tests at
diff --git a/en/security/selinux/implement.html b/en/security/selinux/implement.html
index 6fe41544..e899eb4d 100644
--- a/en/security/selinux/implement.html
+++ b/en/security/selinux/implement.html
@@ -30,7 +30,7 @@ rules, types, classes, permissions, and more.  A full consideration of SELinux
 is out of the scope of this document, but an understanding of how to write
 policy rules is now essential when bringing up new Android devices. There is a
 great deal of information available regarding SELinux already. See <a
-href="/devices/tech/security/selinux/index.html#supporting_documentation">Supporting
+href="/security/selinux#supporting_documentation">Supporting
 documentation</a> for suggested resources.</p>
 
 <h2 id=summary_of_steps>Summary of steps</h2>