[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: 2f4dad24
am: 0097bfaa -s ours
am skip reason: subject contains skip directive
Change-Id: Ia5e32ecca08f37c390615fa3ee0e33ad39c0f175