[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding...
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: 970a11a0 -s ours
am: 57110ddd
Change-Id: I8fe19b571402d607c0c5be6a5542f322f15f3ed3