Merge "Clean up wifi metrics" into sc-dev