Merge "Fix GetCareMap for small images"