Merge "Throw IOE from within resolveImage rather than NPE." into rvc-dev