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

[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: 80e83cbb -s ours am: cb0de39d -s ours am: 9dc06b13 -s ours
am: d4144f0e -s ours
am skip reason: subject contains skip directive

Change-Id: I45a78d4f33a0e82e7025bf190876b9ecdf5c417d