Make method signatures match core

Change-Id: I3956dd70cadd65168d443859af6a51ac4052c39c