[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: d02a284e -s ours am: 180b6cd2 -s ours
am: 69304e20
Change-Id: Ia8f8de95a2ef3e899c4c151b5099bed4a6977682