Merge "Fix auto update image script to compare image type"