[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: I8ef09890bd6e211c3668fa67d9c7f5081daf6c32