[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: eed34e27 -s ours
am: 349bae67 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 35c4572d is in history
Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2