Merge "[ManualNetworkSelect] Improve error handling"