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

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