[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: 6e09539f am: 7d859a85 -s ours am: edd66071 -s ours am: 5d307d09 -s ours am: bec00aab -s ours
am: 0b97bb3f -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 d02a284e is in history

Change-Id: Ib3b412ee1cd06ab3ba547780127c2c3969706b6e