Export ci_image only if it exists and not null

Change-Id: Ia6382763ef5a13cab13ccc4809a19c71b3ae5ed4
Merge "Export ci_image only if it exists and not null"