am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones

* commit 'cae740173f2797209bea31f3df23e6b664754498':
  Skip over directories when iterating tombstones