[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding...

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: 5c9ea24a -s ours am: a229939e -s ours am: 6a06f9fc -s ours am: cb08c7b6 -s ours
am: 1879dba8 -s ours
am skip reason: subject contains skip directive

Change-Id: Id050602dca1afaffcb242d03d0a78bfc4b50f99e