Make image selection required

Change-Id: I3756fe0040feeadde41d66ff292d15fa0f57debb