[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: ed55dbca29 -s ours am: c025c672c6 -s ours
am: 1afe196758 -s ours
am skip reason: subject contains skip directive

Change-Id: Ica1d58f0fb31a21c80af8f5ee6ddc69c04431a47