Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev