diff --git a/automotive/evs/aidl/android/hardware/automotive/evs/ExposureParameters.aidl b/automotive/evs/aidl/android/hardware/automotive/evs/ExposureParameters.aidl
index 6a85ade..e644fed 100644
--- a/automotive/evs/aidl/android/hardware/automotive/evs/ExposureParameters.aidl
+++ b/automotive/evs/aidl/android/hardware/automotive/evs/ExposureParameters.aidl
@@ -42,7 +42,7 @@
     /** Remainder exposure time in clocks. */
     long fineIntegrationTimeInPixelClocks;
     /**
-     * Logarthm value of coarse integration time multiplier.
+     * Logarithm value of coarse integration time multiplier.
      */
     int coarseIntegrationTimeLShift;
 }
diff --git a/automotive/evs/aidl/android/hardware/automotive/evs/GridStatistics.aidl b/automotive/evs/aidl/android/hardware/automotive/evs/GridStatistics.aidl
index e66c51e..57f72ea 100644
--- a/automotive/evs/aidl/android/hardware/automotive/evs/GridStatistics.aidl
+++ b/automotive/evs/aidl/android/hardware/automotive/evs/GridStatistics.aidl
@@ -25,7 +25,7 @@
  */
 @VintfStability
 parcelable GridStatistics {
-    /** */
+    /** Descriptors of grid statistics in shared memory. */
     GridStatisticDesc[] descriptors;
     /**
      * Shared memory object containing one or more grid statistics.
diff --git a/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h b/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
index afc22d8..5e9a287 100644
--- a/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
+++ b/graphics/composer/2.3/utils/command-buffer/include/composer-command-buffer/2.3/ComposerCommandBuffer.h
@@ -87,6 +87,10 @@
             return;
         }
 
+        if (metadata.size() == 0) {
+            return;
+        }
+
         // space for numElements
         commandLength += 1;