am e5b77688: Merge "Minor code cleanup to enable reuse of the protocol." into klp-dev

* commit 'e5b77688dc6606f774e5bcd37d7d0c10e39f1b8e':
  Minor code cleanup to enable reuse of the protocol.