April 2022 Security update

Change-Id: I26018393b36d896cef91c2c4022fa3cbaa9ddec7
diff --git a/vars/barbet b/vars/barbet
index 977cf64..7f1627f 100644
--- a/vars/barbet
+++ b/vars/barbet
@@ -25,26 +25,26 @@
 
 # Updated manually
 
-readonly prev_kernel_tag=android-12.0.0_r0.41 # Feb 2022
-readonly kernel_tag=android-12.1.0_r0.5
+readonly prev_kernel_tag=android-12.1.0_r0.5
+readonly kernel_tag=android-12.1.0_r0.15 # Apr 2022
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/barbet-sp2a.220305.012-factory-d7f7006b.zip"
-readonly image_sha256="d7f7006b04c0d651a6567a406aa1a963cdbd556822fa2ac733b2a9c1c7fe4fcc"
+readonly image_url="https://dl.google.com/dl/android/aosp/barbet-sp2a.220405.003-factory-549c22f8.zip"
+readonly image_sha256="549c22f8bf8b0d61739b2c46aa16f8d98f2de24b08442b3feade393e24d1759f"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=barbet-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=barbet-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-sp2a.220305.012-4b196d2e.zip"
-readonly ota_sha256="4b196d2e1530eed45f24346f7ecfcde0503ea82789cfc894437c8b8eb42c0338"
+readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-sp2a.220405.003-ed8f42fe.zip"
+readonly ota_sha256="ed8f42fef5284ed761b70d7157b8fb0351d64d5bf5366c499a74a58ba5d450a9"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/bonito b/vars/bonito
index ea41a24..a9b757f 100644
--- a/vars/bonito
+++ b/vars/bonito
@@ -24,23 +24,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/bonito-sp2a.220305.012-factory-0a1c00a1.zip"
-readonly image_sha256="0a1c00a1a0d3609155130c837c4d61d440f4f24207edaeb56522af4c030e4859"
+readonly image_url="https://dl.google.com/dl/android/aosp/bonito-sp2a.220405.003-factory-60d408ea.zip"
+readonly image_sha256="60d408eafb1f24896461fde2b9db30a615c058268cd6438ab9564fcf53a3b60f"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=bonito-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=bonito-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/bonito-ota-sp2a.220305.012-847cc743.zip"
-readonly ota_sha256="847cc743636d824f58827d13349ff2c040f87eed1fe7ba3e46a7f9e7e96953f3"
+readonly ota_url="https://dl.google.com/dl/android/aosp/bonito-ota-sp2a.220405.003-509d7f74.zip"
+readonly ota_sha256="509d7f7440261c5cc520e0803fbf448eade9555a002f150621558af86df37654"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/bramble b/vars/bramble
index 121da94..1091755 100644
--- a/vars/bramble
+++ b/vars/bramble
@@ -25,23 +25,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/bramble-sp2a.220305.012-factory-0047127f.zip"
-readonly image_sha256="0047127f8ac9ab93df5e06c6b52d1ef235ff64c2b44db9c32379e163ba3d5015"
+readonly image_url="https://dl.google.com/dl/android/aosp/bramble-sp2a.220405.003-factory-41421655.zip"
+readonly image_sha256="414216557c52a927c5ac9623910e60e478a9310ad7a7b1f0a21efc618f4fe2c5"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=bramble-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=bramble-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-sp2a.220305.012-1258fdf9.zip"
-readonly ota_sha256="1258fdf9118fc4ccdebb9691a503950cecedcb7fc4ed1f070160f6ef81422b74"
+readonly ota_url="https://dl.google.com/dl/android/aosp/bramble-ota-sp2a.220405.003-080c4046.zip"
+readonly ota_sha256="080c4046e7c63921c2df982888e37130fd2791bce3772d1cd57f57a41bb3866d"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/common b/vars/common
index a1e3072..44eae97 100644
--- a/vars/common
+++ b/vars/common
@@ -2,10 +2,10 @@
 readonly prev_lineageos_branch=lineage-19.0
 readonly lineageos_branch=lineage-19.1
 
-readonly prev_common_aosp_tag=android-12.1.0_r1 # Mar 2022, QC Pixels
-readonly common_aosp_tag=android-12.1.0_r2 # Mar 2022, Pixel 6
+readonly prev_common_aosp_tag=android-12.1.0_r2 # Mar 2022, Pixel 6
+readonly common_aosp_tag=android-12.1.0_r4 # Apr 2022, Pixel 6
 
-readonly prev_common_aosp_build_id=SP2A.220305.012 # Mar 2022, QC Pixels
-readonly common_aosp_build_id=SP2A.220305.013.A3 # Mar 2022, Pixel 6
+readonly prev_common_aosp_build_id=SP2A.220305.013.A3 # Mar 2022, Pixel 6
+readonly common_aosp_build_id=SP2A.220405.004 # Apr 2022, Pixel 6
 
-readonly topic=12L-raviole
+readonly topic=S_asb_2022-04
diff --git a/vars/coral b/vars/coral
index 0feb8f8..f4a8e60 100644
--- a/vars/coral
+++ b/vars/coral
@@ -23,23 +23,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/coral-sp2a.220305.012-factory-1b787a94.zip"
-readonly image_sha256="1b787a94e2bf49609a33140414d4c08f2ba0ea4e6de101dd186ce01dd6f69816"
+readonly image_url="https://dl.google.com/dl/android/aosp/coral-sp2a.220405.003-factory-7c0ef94e.zip"
+readonly image_sha256="7c0ef94e4180cfb3df57f80b1cba73110d3bc6f084eed989a7eac9dc72c7d0b6"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=coral-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=coral-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/coral-ota-sp2a.220305.012-a2a622e2.zip"
-readonly ota_sha256="a2a622e2e9e9d61696e509e4ad38f6199cf3aabd9f6ddfb21cd1fb799cb6d739"
+readonly ota_url="https://dl.google.com/dl/android/aosp/coral-ota-sp2a.220405.003-2238ce53.zip"
+readonly ota_sha256="2238ce5364388f91f89e61b19c1747c717f8902d6aeb866610bfe2ecc82eab95"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/flame b/vars/flame
index 969fc0c..d84f054 100644
--- a/vars/flame
+++ b/vars/flame
@@ -22,23 +22,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/flame-sp2a.220305.012-factory-44625682.zip"
-readonly image_sha256="44625682d28344540bdd34e2dab678c794d7343208593942d75844ed0ebe20c9"
+readonly image_url="https://dl.google.com/dl/android/aosp/flame-sp2a.220405.003-factory-0138b220.zip"
+readonly image_sha256="0138b22040a493223b621fffe1f1d288d307c67524432805f674be05925c3580"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=flame-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=flame-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/flame-ota-sp2a.220305.012-661704c8.zip"
-readonly ota_sha256="661704c8530e990a600ca054abb615d0d986955129db7802b2b0dbd3ac489ee5"
+readonly ota_url="https://dl.google.com/dl/android/aosp/flame-ota-sp2a.220405.003-4cfe45f7.zip"
+readonly ota_sha256="4cfe45f79eaf6914f618ed11e6943a612623c0a31c51bd02cd35324df37c1242"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/msm-4.14 b/vars/msm-4.14
index cf38cb2..1ddd9c1 100644
--- a/vars/msm-4.14
+++ b/vars/msm-4.14
@@ -2,5 +2,5 @@
 
 # Updated manually
 
-readonly prev_kernel_tag=android-12.0.0_r0.39 # Feb 2022
-readonly kernel_tag=android-12.1.0_r0.2
+readonly prev_kernel_tag=android-12.1.0_r0.2
+readonly kernel_tag=android-12.1.0_r0.13 # Apr 2022
diff --git a/vars/msm-4.9 b/vars/msm-4.9
index 9055775..9648670 100644
--- a/vars/msm-4.9
+++ b/vars/msm-4.9
@@ -2,5 +2,5 @@
 
 # Updated manually
 
-readonly prev_kernel_tag=android-12.0.0_r0.37 # Feb 2022
-readonly kernel_tag=android-12.1.0_r0.1
+readonly prev_kernel_tag=android-12.1.0_r0.1
+readonly kernel_tag=android-12.1.0_r0.11 # Apr 2022
diff --git a/vars/oriole b/vars/oriole
index 67f7bc5..175ffe5 100644
--- a/vars/oriole
+++ b/vars/oriole
@@ -22,23 +22,23 @@
 
 # Updated manually
 
-readonly prev_build_id=S2B3.220205.007.A1 # 12L Beta 3
-readonly build_id=SP2A.220305.013.A3 # Mar 2022
+readonly prev_build_id=SP2A.220305.013.A3 # Mar 2022
+readonly build_id=SP2A.220405.004 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="unknown"
-readonly aosp_tag="android-12.1.0_r2"
+readonly prev_aosp_tag="android-12.1.0_r2"
+readonly aosp_tag="android-12.1.0_r4"
 
-readonly prev_build_number="8133516"
-readonly build_number="8229987"
+readonly prev_build_number="8229987"
+readonly build_number="8233519"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/oriole-sp2a.220305.013.a3-factory-8bea92d1.zip"
-readonly image_sha256="8bea92d1215036b9d6d3f8e04c9cd07857ff46d810207cfcbdfcf65670b1c5f6"
+readonly image_url="https://dl.google.com/dl/android/aosp/oriole-sp2a.220405.004-factory-f560807e.zip"
+readonly image_sha256="f560807ed4dec7aaeedec831114f4b809d1857da6464f194903bd9413838eed4"
 
-readonly flash_url="https://flash.android.com/build/8229987?target=oriole-user&signed"
+readonly flash_url="https://flash.android.com/build/8233519?target=oriole-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-sp2a.220305.013.a3-d7b50e71.zip"
-readonly ota_sha256="d7b50e710759d7cfcac7ca4057970ff4a4395ee61c750ce51af4159bf3fba873"
+readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-sp2a.220405.004-f019343f.zip"
+readonly ota_sha256="f019343fc56cf466249580dfbdee30ae341a88d6429ecedda727097f51d41c28"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/raven b/vars/raven
index 8360322..17997bb 100644
--- a/vars/raven
+++ b/vars/raven
@@ -25,23 +25,23 @@
 
 # Updated manually
 
-readonly prev_build_id=S2B3.220205.007.A1 # 12L Beta 3
-readonly build_id=SP2A.220305.013.A3 # Mar 2022
+readonly prev_build_id=SP2A.220305.013.A3 # Mar 2022
+readonly build_id=SP2A.220405.004 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="unknown"
-readonly aosp_tag="android-12.1.0_r2"
+readonly prev_aosp_tag="android-12.1.0_r2"
+readonly aosp_tag="android-12.1.0_r4"
 
-readonly prev_build_number="8133516"
-readonly build_number="8229987"
+readonly prev_build_number="8229987"
+readonly build_number="8233519"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/raven-sp2a.220305.013.a3-factory-87b3bf0a.zip"
-readonly image_sha256="87b3bf0aab411afd17220eeb06c83492613b011cb02dcbabdf4fb18df7e2d630"
+readonly image_url="https://dl.google.com/dl/android/aosp/raven-sp2a.220405.004-factory-bce807a6.zip"
+readonly image_sha256="bce807a636fe86eea129336c6f0ddbc026fa4b0af888bc25c92ffb3d007ba543"
 
-readonly flash_url="https://flash.android.com/build/8229987?target=raven-user&signed"
+readonly flash_url="https://flash.android.com/build/8233519?target=raven-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-sp2a.220305.013.a3-14589c37.zip"
-readonly ota_sha256="14589c377bfe5ee6ead1b6199e9d72cdde6b507ce6d151642d0d92058504b1c6"
+readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-sp2a.220405.004-197e873a.zip"
+readonly ota_sha256="197e873a43f21642bbf69f4f3e51d626cf9ece4fcd120a4c91e3df55e1a757b5"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/raviole b/vars/raviole
index 2aab3b9..ec5751d 100644
--- a/vars/raviole
+++ b/vars/raviole
@@ -2,5 +2,5 @@
 
 # Updated manually
 
-readonly prev_kernel_tag=android-s-v2-beta-3_r0.6
-readonly kernel_tag=android-12.1.0_r0.6 # Mar 2022
+readonly prev_kernel_tag=android-12.1.0_r0.6 # Mar 2022
+readonly kernel_tag=android-12.1.0_r0.16 # Apr 2022
diff --git a/vars/redbull b/vars/redbull
index fd845fc..f8418a0 100644
--- a/vars/redbull
+++ b/vars/redbull
@@ -2,5 +2,5 @@
 
 # Updated manually
 
-readonly prev_kernel_tag=android-12.0.0_r0.40 # Feb 2022
-readonly kernel_tag=android-12.1.0_r0.4
+readonly prev_kernel_tag=android-12.1.0_r0.4
+readonly kernel_tag=android-12.1.0_r0.14 # Apr 2022
diff --git a/vars/redfin b/vars/redfin
index 8a72545..c2737af 100644
--- a/vars/redfin
+++ b/vars/redfin
@@ -26,23 +26,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/redfin-sp2a.220305.012-factory-49873101.zip"
-readonly image_sha256="4987310118f0165117f62354ea4b926b817a08cbea473f90efcd91f7c2803b5b"
+readonly image_url="https://dl.google.com/dl/android/aosp/redfin-sp2a.220405.003-factory-cb9855a6.zip"
+readonly image_sha256="cb9855a668f618e30825d24d29d68557f757f149cebf8eec10be5a4404239fde"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=redfin-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=redfin-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-sp2a.220305.012-5eea053e.zip"
-readonly ota_sha256="5eea053e29131d5f8e414c3eb72ad60a73050abac40a3532de1abb2c924e36c9"
+readonly ota_url="https://dl.google.com/dl/android/aosp/redfin-ota-sp2a.220405.003-7d56639f.zip"
+readonly ota_sha256="7d56639f816a8382ae0cb5a8da2920eb3d314b74c9438555c5e6031044be530b"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/sargo b/vars/sargo
index 805f760..dcc1662 100644
--- a/vars/sargo
+++ b/vars/sargo
@@ -23,23 +23,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/sargo-sp2a.220305.012-factory-6a43e833.zip"
-readonly image_sha256="6a43e8336e38043a0659d92e2e0f28add66dc82d56a4298f901bd2cd2191c940"
+readonly image_url="https://dl.google.com/dl/android/aosp/sargo-sp2a.220405.003-factory-c5347c7a.zip"
+readonly image_sha256="c5347c7a2b7f401511c893c252a9c225f49c8bfe14f0b3d36802dfebfec6f79f"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=sargo-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=sargo-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/sargo-ota-sp2a.220305.012-66210901.zip"
-readonly ota_sha256="662109017074fd71c3f8603375680ebc8fcc0745bcfe92a4094356203cff817b"
+readonly ota_url="https://dl.google.com/dl/android/aosp/sargo-ota-sp2a.220405.003-2a2d9802.zip"
+readonly ota_sha256="2a2d980235ad30412d31e58f3e29bef29a0738a354f5da34985ce1cd571993fa"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"
diff --git a/vars/sunfish b/vars/sunfish
index 318281e..6a5f76a 100644
--- a/vars/sunfish
+++ b/vars/sunfish
@@ -23,23 +23,23 @@
 
 # Updated manually
 
-readonly prev_build_id=SQ1A.220205.002 # Feb 2022
-readonly build_id=SP2A.220305.012 # Mar 2022
+readonly prev_build_id=SP2A.220305.012 # Mar 2022
+readonly build_id=SP2A.220405.003 # Apr 2022
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-12.0.0_r28"
-readonly aosp_tag="android-12.1.0_r1"
+readonly prev_aosp_tag="android-12.1.0_r1"
+readonly aosp_tag="android-12.1.0_r3"
 
-readonly prev_build_number="8010174"
-readonly build_number="8177914"
+readonly prev_build_number="8177914"
+readonly build_number="8210211"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/sunfish-sp2a.220305.012-factory-f4a9c665.zip"
-readonly image_sha256="f4a9c665b3614ef4ad84e0b5cb9d4207837288c72430974dcbdf81d6ba460f5c"
+readonly image_url="https://dl.google.com/dl/android/aosp/sunfish-sp2a.220405.003-factory-1efe375b.zip"
+readonly image_sha256="1efe375bc03b534cdf5bbe7a0124c141169c3ab1b95aa008149928c5aecfa569"
 
-readonly flash_url="https://flash.android.com/build/8177914?target=sunfish-user&signed"
+readonly flash_url="https://flash.android.com/build/8210211?target=sunfish-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/sunfish-ota-sp2a.220305.012-83e86fac.zip"
-readonly ota_sha256="83e86fac6c854b9a500635b7efd3afe295c153e3e28e8403e55c80fa5d8b49e5"
+readonly ota_url="https://dl.google.com/dl/android/aosp/sunfish-ota-sp2a.220405.003-e7cb5dd4.zip"
+readonly ota_sha256="e7cb5dd48c4d9b30226499444a996840e57ea43f863baf13b10965fd360b2108"
 
-readonly security_patch="2022-03-05"
+readonly security_patch="2022-04-05"