cec6c601f4
Adjust for manual move Do not assume that tmpfile and target are on the same filesystem and use copy instead of rename. Change-Id: Ide16e541032f5bcc3ea462a9347faebdc5d7d670