Merge "Don't log 'Not Found' ERROR during image cleanup"