Merge "Image: fix build break"