[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 5240e718 am: 5f8f0c8b -s ours am: 1d752341 -s ours am skip reason: subject contains skip directive Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385