Merge "Unconditionally unlink image." am: 74a871ae12 am: 85e0c9c30c
am: f58d0fec96

Change-Id: I2f646db64d5d4a4678cf51bf1a955af5ee4d86a3