Merge "Check that install file exists before unlink"
am: 05d48050c1

Change-Id: I2a216be7e2f055cc520405bd49f67c3dc18bc542