Merge "custom_image: fix build break"