Merge "Revert "STOPSHIP: Additional Wifi logging temporarily disabled""