Merge pull request #18506 from tophj-ibm/power-and-z-frozen-images-fix

Fixes for building on ppc64le and 390x due to ensure-frozen-images