Also always handle the new return values. PiperOrigin-RevId: 514698931 Change-Id: Ib4ce06e4f17c438271a0452053d3b0bc368e9970