[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: 1f132425
Change-Id: I8094ea15c438288bc8ca1655d560c17723756636