
We currently have two factory methods where it is completely unclear which one needs to be overridden. This change deprecates the old one, adds a Util method to easily map back from the new to the old behaviour, and updates all implementations of the now deprecated method in our code. PiperOrigin-RevId: 224303560