am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

* commit 'df8b604e9bf49bcf9a620e4fe19ccf19c2c49487':
  Fix NPE in deleteDatabase().