Merge changes Ia8a8eab7,I1e193f35 into main

* changes:
  Stop tethering request only if fuzzy-matched to existing request
  Reject TetheringRequests that fuzzy-match existing ones