[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding...
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 3b2016ea -s ours
am: e8afcabb
Change-Id: Iaaccf1ae6b1c600c5d6b3d4b7e525a116db10748