[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP...
[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev am: 9728e85e -s ours
am: d3ac747d
Change-Id: Ifc100125a206c087abc37d7744f6b5b7db76913a