[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: Iae90c1702ca18b2898351e6f3165c1706e996b02