am 5ed40dc5: am 8db91925: Merge "Switch to proper networkcallback api" into lmp-dev

* commit '5ed40dc54267a2614e7275dbe0900c220500b711':
  Switch to proper networkcallback api