Make image test multi image
am: 25adcfb7dc

Change-Id: Iea181f7ef946b7a063d3424845774517011fc706