[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: 05aa041a00 -s ours
am: 36ef880276 -s ours
am skip reason: subject contains skip directive

Change-Id: Id050602dca1afaffcb242d03d0a78bfc4b50f99e