Merge "Ignore NotFound during network cleanup on API"