Merge "Fix the build error for dualroot chain of trust." into integration