Reordered the definitions.

No other changes.

Change-Id: I35347adfd98ebd2e096a2053b1c81acf33936698
1 file changed