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

Change-Id: Ic67ff0190cb0fc9258789fafe084a8f4c88155a1