[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding...

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: eaba510a am: 6cec3764 -s ours am: c517d039 -s ours am: 89ab886a -s ours
am: 48d379dc -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 55d82d63 is in history

Change-Id: I3b3fdc57c47d4c53ece90f6ab6cbcd93cc58fb24