Merge "Skip iso image import testing for now"