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

Change-Id: I27da880eee00de2b9ac7ce0f7f812067beaccb45