Fix order of function pointers

Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3
(cherry picked from commit c8945b3fb850985794efcb8afbbdc2f5985d7088)