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