Merge "Add a stub for forgotten callback to fix master-gpl."