Merge "[FileRepo] Fixed file move data-loss race condition."