8007617: Better validation of images

Reviewed-by: prr, jgodinez
2 files changed