Merge "DatabaseMysqlBase visibility cleanups"