Merge "Replace NetworkUtils methods"