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

Change-Id: I6fe94329ecec1ad6a2dcd348b45ad777a11dcbb5