Merge "Make image test multi image" into nyc-mr1-dev