diff --git a/docs/html/distribute/essentials/quality/core.jd b/docs/html/distribute/essentials/quality/core.jd
index d7eedf320e0f9..f0e494b00ad00 100644
--- a/docs/html/distribute/essentials/quality/core.jd
+++ b/docs/html/distribute/essentials/quality/core.jd
@@ -238,7 +238,7 @@ page.image=/distribute/images/core-quality-guidelines.jpg
 
 <div class="resource-widget resource-flow-layout col-13" data-query=
 "collection:distribute/essentials/corequalityguidelines/visualdesign"
-data-sortorder="-timestamp" data-cardsizes="9x3,9x3,6x3,6x3,6x3"
+data-sortorder="-timestamp" data-cardsizes="6x3"
 data-maxresults="6">
 </div>
 
@@ -1140,7 +1140,7 @@ data-cardsizes="6x3,6x3,6x3,6x3,6x3,6x3" data-maxresults="6">
     Pay close attention to alarms, timers, notifications, syncs, and so on.
     See <a
     href="{@docRoot}training/monitoring-device-state/doze-standby.html#testing_doze_and_app_standby">Testing
-    with Doze and App Standby</a>.
+    with Doze and App Standby</a> for requirements and guidelines.
     </p>
   </td>
   </tr>
diff --git a/docs/html/training/monitoring-device-state/doze-standby.jd b/docs/html/training/monitoring-device-state/doze-standby.jd
index 50c3d11750305..8038e3841c42d 100644
--- a/docs/html/training/monitoring-device-state/doze-standby.jd
+++ b/docs/html/training/monitoring-device-state/doze-standby.jd
@@ -32,7 +32,7 @@ Standby</a>
         <li><a href="#testing_your_app_with_app_standby">Testing your app with App Standby</a></li>
       </ol>
       </li>
-      <li><a href="#whitelisting-cases">Example Use Cases for Whitelisting</a></li>
+      <li><a href="#whitelisting-cases">Acceptable Use Cases for Whitelisting</a></li>
     </ol>
   </div>
 </div>
@@ -422,7 +422,7 @@ $ adb shell am get-inactive &lt;packageName&gt;</pre>
 </ol>
 
 
-<h2 id="whitelisting-cases">Example Use Cases for Whitelisting</h2>
+<h2 id="whitelisting-cases">Acceptable Use Cases for Whitelisting</h2>
 
 <p>The table below highlights the acceptable use cases for requesting or being on
    the Battery Optimizations exceptions whitelist. In general, your app should not be on the
@@ -456,13 +456,22 @@ $ adb shell am get-inactive &lt;packageName&gt;</pre>
 
  <tr>
     <td rowspan="1">Instant messaging, chat, or calling app;
-    enterprise VOIP apps</td>
+    enterprise VOIP apps.</td>
     <td>No, can not use GCM because of technical dependency on another messaging
     service or Doze and App Standby break the core function of the app.</td>
     <td style="color:green">Acceptable</td>
     <td></td>
  </tr>
 
+  <tr>
+    <td rowspan="1">Task automation app</td>
+    <td>App's core function is scheduling automated actions, such as for instant
+    messaging, voice calling, new photo management, or location actions.</td>
+    <td>If applicable.</td>
+    <td style="color:green">Acceptable</td>
+    <td></td>
+ </tr>
+
 </table>