I missed splitting the changes into commits per packages. I will send a V2 with a dedicated patch for CoffeelakeSiliconPkg and WhiskeylakeOpenBoardPkg in a patch series.