[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 skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history

Change-Id: Idc71ae33d1290847f33c1f040dabe79bcaa5f767