Merge "Update KernelAdiutor" into mm6.0