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