tree c39040aea735c3e51d3931242c5d47680b88a587
parent a3771b4c09444f3defa902de845f98284cff639d
author dschinazi <dschinazi@google.com> 1614634456 -0800
committer Copybara-Service <copybara-worker@google.com> 1614634491 -0800

Fix merge by inverting macro order

This CL has no impact on google3

PiperOrigin-RevId: 360265346
Change-Id: I2ff5a576abb8df2f37f592833efcc0ebea33a5b8