Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"

This reverts commit 89f0bc26cdbb519564ea703bb411f56382a8eb8b.
6 files changed