[Bug 222829] Kernel test update causes conflict