Merge "Merge "Throw IOE from within resolveImage rather than NPE." into rvc-dev am: 36060929 am: e9efb210 am: 159b335a" into rvc-qpr-dev-plus-aosp