Merge pull request #7510 from daverodgman/fix-psa-aead-chacha20-test-dependency-2.28