WaE: -Wreorder

Change-Id: I8b6e3aafa6208223a65b777c232de88cfb2e5a8c