[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: eaba510a56 am: 6cec376495 -s ours am: c517d0394a -s ours am: 89ab886a03 -s ours
am: 48d379dc8a -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 55d82d63b7 is in history

Change-Id: I3b3fdc57c47d4c53ece90f6ab6cbcd93cc58fb24