Merge "Remove Cdb compat class names"