Merge "QcomModulePkg: Update MemMapSize before calling to get memory map"