[GIT PULL] AMDTEE update for 6.20