Merge "Unconditionally unlink image." into oc-mr1-dev