Merge "Fix bogus image test assert"