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

Change-Id: I63d68d3e3c208ceefbc1254bfdec3bc7c3f41550