Merge "DO NOT MERGE: Don't delete source file when a move opration is canceled" into nyc-mr1-dev am: d4f39096 am: 13825ea1 Change-Id: I2cc666f00902e4d12f2e86a326099ca25a742cac