Merge "QcomModulePkg: Correct the image size when avb is disabled"