Fix calls to DatabaseBase static functions

Previously they were calling Database:: which is a nonexistent class.

Change-Id: I73b2ed4722c9108b6a00c8c0cabbda9564378b4b
Merge "Fix calls to DatabaseBase static functions"