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

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: eed34e27 -s ours am: 349bae67 -s ours am: 87d1eca7 -s ours am: 1ea67002 -s ours
am: 83c6a9ea -s ours
am skip reason: subject contains skip directive

Change-Id: Ida3c731f69050002debc52cdb5de45045df7cd4a