Merge "Change Database type hints to use IDatabase"