[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure...
[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: fd757836 -s ours
am: 3a144872
Change-Id: I08b507e49c2a05b19ae75686dcdfc9d9fe262dac