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

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