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

Change-Id: Id90bd82b42dda93238c9b71c5045387cc9d43085