Merge "DO NOT MERGE: Don't delete source file when a move opration is canceled" into nyc-mr1-dev