Merge "Remove race conditions in CopyJobTest and MoveJobTest." into arc-apps