Refactor tether logic for reuse am: 135619d483
am: 4c2fc34707
-s ours
am: d76eddacff
-s ours
Change-Id: I4a31f3a870c794b9e348445f419bf08e64d87194
This commit is contained in: