These IntDefs are now annotated with TYPE_USE [1], so they can be moved to directly before the type (int). [1] Since <unknown commit> PiperOrigin-RevId: 406803555
