Use same arguments for globalApiPreHandlers as for apiPreHandlers

Change-Id: Ia657c9f118fae78662921d92558ebbfde0565c9e
Merge "Use same arguments for globalApiPreHandlers as for apiPreHandlers"