Merge changes Ia8726375,I9d368d8a into main

* changes:
  Use Dependencies to mock static methods
  Add a new TetheringMetrics constructor