Merge "Fix service resolve on tethering downstreams"