Merge "Use VSR to tell libhwtrust_cxx how to validate"