Merge "Add a stub to fix master-gpl"