Changed some DatabaseBase type hints to IDatabase

Change-Id: Id945aaabbf5b467106676ea9f3eab3a6161c7f3d
Merge "Changed some DatabaseBase type hints to IDatabase"