DO NOT MERGE: Don't delete source file when a move opration is canceled
am: 682d370390

Change-Id: I22b980489abe69675fe05d166576dfdbd1bd5c64