Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c skipped: 8dc61493
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)