Fix -Werror=reorder

Change-Id: Iecfd714834b1d2f24098d55b9b32daa5ca76b1de