Merge "Refactor tether logic for reuse" into oc-mr1-dev