Use composition instead. This makes the null-handling more explicit & complete (previous implementation tried to prevent null values, but didn't override all mutation methods e.g. replace(), putIfAbsent() etc.) PiperOrigin-RevId: 274778513