[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state...
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: add688f6 -s ours am: fe6f43da -s ours
am: 1d270542
Change-Id: I70352ac6644193e012ae5be8a3424c8162a9ec4a