am ca5d99ac: Merge "Guarantee that all db related files are deleted together."

* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.