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

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