Merge "DO NOT MERGE: Don't delete source file when a move opration is canceled" into nyc-mr1-dev am: d4f39096dd am: 13825ea1af
am: 5d2afaaebe  -s ours

Change-Id: I27dd3017346b866f0f736c129052960bf46726dd