Add image_id

Change-Id: Ie1f04effeb8ebb25ef3fee856e065c19a8fabe77