This change is similar to 27caeb8038 (CEA-608), but is currently lacking unit tests. PiperOrigin-RevId: 582585457
27caeb8038