[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 skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 07422535 is in history
Change-Id: I6fb78cdd8f4c748d6cafa85bdb1f8f60d676373b