am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."

* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.