Merge "Fix image import tests for read-only stores"