[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 30e2e54327 am: 2d6b83c629 -s ours am: 62fe600b01 -s ours
am: 25b32b603f -s ours
am skip reason: subject contains skip directive

Change-Id: I6528bde91ebd32cd16010d533542e4bc1c3f00aa