* cl/398081751 Use the proto message number instead of index for enums.

* cl/398323481 Two-way sync for PR #36085. No-op, or fixes merge conflicts, if any.

Co-authored-by: honeybadgerdontcare <sedano@google.com>