[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 55d82d63b7 -s ours am: dcca362cb9 -s ours
am: 6ba64dfcc7

Change-Id: Ia8f8de95a2ef3e899c4c151b5099bed4a6977682