[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure...

[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c44 am: 52d26b0e am: 99686f56 am: 66e72bea skipped: b77ddb59 am: be09c001 am: dbe1fca6 am: 5a9e319b -s ours
am: ecea4f43 -s ours
am skip reason: subject contains skip directive

Change-Id: I62b912a903fd900156210184434eed0d3d73037b