Fix image_space_test on Q+ target. am: 3f795d2ab3
am: 7e5c5bace8

Change-Id: I051b4cf767fa65c8ea5691d469c3fc299940815d