Don't set link parameter for image when not necessary

Change-Id: Iaa3ce10abb43a5939780317f855e81880dea763b
Merge "Don't set link parameter for image when not necessary"