From d1432ab77360f98eaa958eb87f1b26dafca81f66 Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Tue, 19 May 2026 00:52:33 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 917668234
---
 tools/cel_unparser.cc            | 2 +-
 tools/flatbuffers_backed_impl.cc | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/cel_unparser.cc b/tools/cel_unparser.cc
index 28a1187bb..569fadc7d 100644
--- a/tools/cel_unparser.cc
+++ b/tools/cel_unparser.cc
@@ -248,7 +248,7 @@ absl::Status Unparser::VisitOptSelect(const Expr::Call& expr) {
 
 absl::Status Unparser::VisitCall(const Expr::Call& expr) {
   const auto& fun = expr.function();
-  absl::optional<std::string> op = LookupUnaryOperator(fun);
+  std::optional<std::string> op = LookupUnaryOperator(fun);
   if (op.has_value()) {
     return VisitUnary(expr, *op);
   }
diff --git a/tools/flatbuffers_backed_impl.cc b/tools/flatbuffers_backed_impl.cc
index 10c0b1cb8..3993f3b53 100644
--- a/tools/flatbuffers_backed_impl.cc
+++ b/tools/flatbuffers_backed_impl.cc
@@ -102,7 +102,7 @@ class ObjectStringIndexedMapImpl : public CelMap {
     return true;
   }
 
-  absl::optional<CelValue> operator[](CelValue cel_key) const override {
+  std::optional<CelValue> operator[](CelValue cel_key) const override {
     if (!cel_key.IsString()) {
       return CreateErrorValue(
           arena_, absl::InvalidArgumentError(
@@ -178,8 +178,7 @@ absl::StatusOr<bool> FlatBuffersMapImpl::Has(const CelValue& key) const {
   return true;
 }
 
-absl::optional<CelValue> FlatBuffersMapImpl::operator[](
-    CelValue cel_key) const {
+std::optional<CelValue> FlatBuffersMapImpl::operator[](CelValue cel_key) const {
   if (!cel_key.IsString()) {
     return CreateErrorValue(
         arena_, absl::InvalidArgumentError(