Merge "QcomModulePkg: Make CheckRootDeviceType() compatible"