[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 519c5338 am: 0052770e -s ours am: 111aca0a -s ours am skip reason: subject contains skip directive Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688