am adad989b: Merge "Add a stub to fix master-gpl"

* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl