am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev

* commit '5adbea2e2da3a0af1357de05a04534c65a7c9f76':
  Add handshake broadcast support