(based on cl/196889713 and cl/197018177)

PiperOrigin-RevId: 202529544
GitOrigin-RevId: f290535f5a57642982d30c43b113cdae6fd7a385