diff --git a/Android.bp b/Android.bp
index a4a058fce0..dccbf2f256 100644
--- a/Android.bp
+++ b/Android.bp
@@ -408,6 +408,9 @@ android_library {
     lint: {
         baseline_filename: "lint-baseline.xml",
     },
+    flags_packages: [
+        "com_android_launcher3_flags",
+    ],
 }
 
 //
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 6948133abb..768ba652de 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,8 +1,10 @@
 [Builtin Hooks]
 ktfmt = true
+bpfmt = true
 
 [Builtin Hooks Options]
 ktfmt = --kotlinlang-style
+bpfmt = -d
 
 [Tool Paths]
 ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index cc746eb7ec..6893b1f30c 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -565,6 +565,14 @@ flag {
   bug: "395145453"
 }
 
+flag {
+  name: "google_sans_flex_font"
+  namespace: "launcher"
+  description: "Adds refresh for font family. Needs to be fixed to be used in resources."
+  bug: "395145453"
+  is_fixed_read_only: true
+}
+
 flag {
   name: "restore_archived_shortcuts"
   namespace: "launcher"