[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 43a19bd8c8 -s ours
am: cf2d818b2b

Change-Id: Icd8a29a77a8d2656ca1221a9a9347889cad07ebb