Merge "Make image test multi image" into nyc-mr1-dev
am: 41be588f4f

Change-Id: I427a63c24354ca8f6f8df788881730b95128e16b