Merge "Switch to proper networkcallback api" into lmp-dev