Merge "Remove redundant DatabaseBase doc comments"