am 8e3c7708: Merge "Fix potential out of order callbacks." into klp-dev

* commit '8e3c770888d0c587fdac8a8f5878e23fc59d7700':
  Fix potential out of order callbacks.