diff --git a/core/Makefile b/core/Makefile
index 981e29b186..0d2328cb99 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4230,7 +4230,7 @@ else
   ifeq ($(TARGET_PRODUCT),sdk)
     build_ota_package := false
   endif
-  # A target without a kernel or recovery fstab may be one of the following:
+  # A target without a kernel may be one of the following:
   # - A generic target. In this case, the OTA package usually isn't built.
   #   PRODUCT_BUILD_GENERIC_OTA_PACKAGE may be set to true to force OTA package
   #   generation.
@@ -4245,10 +4245,10 @@ else
       ifeq ($(TARGET_NO_KERNEL),true)
         build_ota_package := false
       endif
-      ifeq ($(recovery_fstab),)
-        build_ota_package := false
-      endif
     endif # INSTALLED_BOOTIMAGE_TARGET == ""
+    ifeq ($(recovery_fstab),)
+      build_ota_package := false
+    endif
   endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE
 
   # Set build_otatools_package, and allow opt-out below.
diff --git a/core/build_id.mk b/core/build_id.mk
index 9f52bb68bb..6d5e3b9da3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=SP1A.210720.002
+BUILD_ID=SP1A.210721.001