Merge "Fix kernel net tests fail in user build"