Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 69583136 am: 7b22fef9
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 69583136
DO NOT MERGE Separate SDP procedure from bonding state (1/2)