Merge "Refactor tether logic for reuse" into oc-mr1-dev
am: 705a9e7e85

Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c