Snap for 6698269 from e1754658b217b9325114b732325e27083ecbc17e to mainline-release

Change-Id: Ic21dd00f680bedfb0c994c4abe2b5e782fb8e576
diff --git a/2_device-types/2_5_automotive-reqs.md b/2_device-types/2_5_automotive-reqs.md
index 84077a4..dbf4dd8 100644
--- a/2_device-types/2_5_automotive-reqs.md
+++ b/2_device-types/2_5_automotive-reqs.md
@@ -353,10 +353,10 @@
 stats are available to developers through System API
 `android.car.storagemonitoring.CarStorageMonitoringManager`. The Android Open
 Source Project meets the requirement through the `uid_sys_stats` kernel module.
-*   [[8.3](#8_3_power_saving_modes)/A-1-3] MUST enter [Garage Mode](https://source.android.com/devices/automotive/garage_mode)
-at least once before the car is powered down.
-*   [[8.3](#8_3_power_saving_modes)/A-1-4] MUST be in [Garage Mode](https://source.android.com/devices/automotive/garage_mode)
-for at least 15 minutes unless:
+*   [[8.3](#8_3_power_saving_modes)/A-1-3] MUST support [Garage Mode](
+    https://source.android.com/devices/automotive/garage_mode).
+*   [[8.3](#8_3_power_saving_modes)/A] SHOULD be in Garage Mode for at least
+    15 minutes after every drive unless:
     *    The battery is drained.
     *    No idle jobs are scheduled.
     *    The driver exits Garage Mode.