[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 55d82d63b7 -s ours
am: dcca362cb9 -s ours
am skip reason: subject contains skip directive

Change-Id: I0fc084108e561565c99c1fa83484b4a9eaf076d2