Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr1-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c44 am: 52d26b0e
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c44
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"