[GIT PULL] AMDTEE simplification for v5.18