[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding...
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev
am: ed55dbca -s ours
am skip reason: change_id Ic43bb63fa5d4f10e08e577483f568f8025f0b1f3 with SHA1 36ba892c is in history
Change-Id: Icfec9fe05ee4cf22dd2c5d225a2a8cf914b5995a