Dont set ci_image for a second time

Change-Id: I2071e655910f2ccf8aeb405dceb8a71c6dc96592
Merge "Dont set ci_image for a second time" into R2.0