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

* commit '3d65dcbcec75bd53bb9da6ecebcb9dccc8eb42c7':
  Clean stale entries when deleting files.