Merge "Remove test_db_archive_deleted_rows"