Merge "Fix Nokia image generation"