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