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

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