am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev

* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
  Listener callbacks ordering fixups