DO NOT MERGE: Don't delete source file when a move opration is canceled am:...
DO NOT MERGE: Don't delete source file when a move opration is canceled am: 682d3703 am: 40244603
am: 0e4cb174 -s ours
Change-Id: If20b3ee7f03d145e6d86076283f0daee9388b2ff