Merge "Unconditionally unlink image." into oc-mr1-dev
am: 19d9cf4dd8

Change-Id: If949f9ccad4aca98d7b7abe3c088db2682d0e4a1