[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 skip reason: change_id Ic43bb63fa5d4f10e08e577483f568f8025f0b1f3 with SHA1 36ba892cf9 is in history

Change-Id: I56fb6f4ff5cef24eb5a1a56832984bb0541882ae