Merge "ART: Restrict ImageSpace space check to first image" am: a2d18b7072
am: dbf2c9c17d

Change-Id: I8e01f2b5de71b041976c31aa3e1226966951721f