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

Change-Id: Iefd08cbed4f0be143c99a1aaf4c7f71ca1a806fe