am e3805c61: Merge "Add handshake callback support" into klp-modular-dev

* commit 'e3805c6144038207bc72654bd250054e5821c373':
  Add handshake callback support