Merge "Fix kernel net tests fail in user build" into qt-r1-dev