More strict images validation

Change-Id: Ie9ba639c900f2e5456cad379107950d2a5b8e7d3