Merge "Refactor TetheringMetricsTest"