am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev

* commit '37c8f8b510a13b14a5e043a0735c91609917843d':
  Unlink an old file before moving the new file over it