Merge "Add @deprecated tags to DatabaseBase"