[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: 48373a7b
Change-Id: Ifb2a84a0c9540c17634ea35c52b6032301f12172