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

Change-Id: Icc85c2b3a0ebc83796d6d732fbb8ecff97ec321e