[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 skip reason: subject contains skip directive

Change-Id: I5009a1d5a4fbcecc734f236cc9fc23555a69ed4b