Merge "Nullability check for sysinfo module"