Merge "Cleanup drl files in policy/engine test modules"