am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev

* commit '588430591b7bb5340ff02f05f1c02eaf924326ad':
  Clean stale entries when deleting files.