[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
am: 38a839b5
Change-Id: I53f890ea204a8c3afccd6c95da09301522125114