Merge "Fix ubuntu image creation issue"