Merge "Fix native method signatures"