[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state...
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: db88f910 -s ours am: 5fa240a9
am: acdbb872
Change-Id: Ia1cf18e2b5f043f814f08691b7bde8420d1bc064