Merge "Clean stale entries when deleting files." into mnc-dr-dev