[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding...
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: 0fb39a11
am: 3ad36be2 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 72f53256 is in history
Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd