DO NOT MERGE: Don't delete source file when a move opration is canceled am: 682d370390 am: 4024460305
am: 0e4cb1740f -s ours
Change-Id: If20b3ee7f03d145e6d86076283f0daee9388b2ff
This commit is contained in: