Merge "Tethering: ensure downstream prefix do not conflict with upstream"