Merge "xci: Fix images directory permissions"