[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b am: 286cfd69 -s ours am: b6e53063 -s ours am skip reason: subject contains skip directive Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385