diff --git a/bazel/BUILD b/bazel/BUILD
index 551200cdbf..be2e946f4c 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -7,6 +7,7 @@
 
 load("@rules_python//python:defs.bzl", "py_binary")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # begin:google_only
 # package(default_applicable_licenses = ["//upb:license"])
@@ -14,6 +15,16 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 licenses(["notice"])
 
+# begin:google_only
+# selects.config_setting_group(
+#     name = "android_opt",
+#     match_all = [
+#         "//tools/cc_target_os:android",
+#         "//tools/compilation_mode:opt",
+#     ],
+# )
+# end:google_only
+
 py_binary(
     name = "amalgamate",
     srcs = ["amalgamate.py"],
diff --git a/bazel/build_defs.bzl b/bazel/build_defs.bzl
index 64c877ec3e..1ed1ffe40c 100644
--- a/bazel/build_defs.bzl
+++ b/bazel/build_defs.bzl
@@ -30,12 +30,20 @@ _DEFAULT_COPTS.extend([
 
 UPB_DEFAULT_CPPOPTS = select({
     "//upb:windows": [],
+    # begin:google_only
+#     # Override default -Oz for release builds on Android.
+#     "//bazel:android_opt": _DEFAULT_CPPOPTS + ["-O2"],
+    # end:google_only
     "//conditions:default": _DEFAULT_CPPOPTS,
 })
 
 UPB_DEFAULT_COPTS = select({
     "//upb:windows": [],
     "//upb:fasttable_enabled_setting": ["-std=gnu99", "-DUPB_ENABLE_FASTTABLE"],
+    # begin:google_only
+#     # Override default -Oz for release builds on Android.
+#     "//bazel:android_opt": _DEFAULT_COPTS + ["-O2"],
+    # end:google_only
     "//conditions:default": _DEFAULT_COPTS,
 })