Refactor tether logic for reuse am: 135619d483
-s ours am: cc92875825
-s ours
am: 3c7d47bf87
-s ours
Change-Id: I6a6edaa938b521d571415af72424a9684321fb8d
This commit is contained in: