Merge "Make IDatabase return type documentation less confusing"