Merge "Revert "Clean up published network condition reporting.""