[automerger skipped] Fix image_space_test on Q+ target.
am: 3ac5ea4aa6 -s ours
am skip reason: change_id If84cde5e68ae42aed7d2a402817436c19ee6fc21 with SHA1 3f795d2ab3 is in history

Change-Id: I55542cbf31f1a5c65d487cf0cbdd6a562af9322b