Merge "Add wifi metrics for WifiLocks"