Merge "Avoid DatabaseBase type errors in setupDatabaseWithTestPrefix()"