[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: 07422535 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 69583136 is in history
Change-Id: Ied8e02f8c14ed6190cc9baebf688359d682b6d00