171b0d6e06
Also, move macros to the globals section. PiperOrigin-RevId: 641936967 Change-Id: I5b1f6aa52c69e68cc6310093c5811f0f20828bab