[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from...
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"" into pi-dev am: f837bc93 -s ours
am: 09af97b7
Change-Id: Iee8e7a24e3e617068aa52fa7edebe908979c876f