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

* commit '784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78':
  Add handshake broadcast support