diff --git a/current.txt b/current.txt
index 2893748e0d..1f6d59238f 100644
--- a/current.txt
+++ b/current.txt
@@ -98,7 +98,7 @@ bd366b83d8d565d0e8bfabff3adfcab0259d75b4e2a9f8e1b91e11d1593a2ffb android.hardwar
 17971eb8a482893dadcfc16e0583f492d42a034ef95d9b0b709417af30838396 android.hardware.graphics.allocator@2.0::IAllocator
 60bf42a4898e4fb70dbd720b263aeafd7f35f5e1a5effeabb4d5d659878a5f18 android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer
 b8a75617b9ec12bea641f3a73d4025a33e8b9a2f9169dd46094af56adf9249c5 android.hardware.graphics.bufferqueue@1.0::IProducerListener
-78f973cf47a45d9d842c95888324dfc44e24a6fa3e5a1d0f726dfe37a863b634 android.hardware.graphics.common@1.0::types
+862cd4c41884b6c06d843b88061a021ed117e751b60b8efe8916eb64a0b3c062 android.hardware.graphics.common@1.0::types
 b3aac6c3817f039964fcd62268274b3039e17bd7d0d5b40b4d1d1c7b19a1f866 android.hardware.graphics.composer@2.1::IComposer
 b19d00eb8a8b3b0034a0321f22e8f32162bf4c2aebbce6da22c025f56e459ea2 android.hardware.graphics.composer@2.1::IComposerCallback
 e992684e690dfe67a8cbeab5005bfa3fa9c2bf3d4b0b75657fb1f0c2d5dd2bae android.hardware.graphics.composer@2.1::IComposerClient
diff --git a/graphics/common/1.0/types.hal b/graphics/common/1.0/types.hal
index 02f34f8b78..76b3bec10d 100644
--- a/graphics/common/1.0/types.hal
+++ b/graphics/common/1.0/types.hal
@@ -314,13 +314,7 @@ enum PixelFormat : int32_t {
      */
     RAW12              = 0x26,
 
-    /**
-     * Must not use.
-     */
-    YCBCR_422_888      = 0x27,
-    YCBCR_444_888      = 0x28,
-    FLEX_RGB_888       = 0x29,
-    FLEX_RGBA_8888     = 0x2A,
+    /** 0x27 to 0x2A are reserved for flexible formats */
 
     /**
      * 32-bit packed format that has 2-bit A, 10-bit B, G, and R components,
@@ -332,11 +326,6 @@ enum PixelFormat : int32_t {
      */
     RGBA_1010102       = 0x2B,
 
-    /**
-     * Must not use. 0x100 is reserved for vendor extensions.
-     */
-    JPEG               = 0x100,
-
     /**
      * 0x100 - 0x1FF
      *