Merge "Unconditionally unlink image."
am: 74a871ae12

Change-Id: Ib5bf81382687eb418dbbfb7caa864c88822fa1a1