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