608cdf17f6
The changes to add tests for v5 and v6 were omitted on merges up from stable-2.14 because they are known not to work. However that ends up causing merge conflicts every time we change something on stable-2.14, so it's better to align it. The tests still don't work, but we're not running them on CI anyway so it's not a problem. Bug: Issue 8799 Change-Id: Ife17bf1c85a3604cbb3dcff1a7098761d2fa4b53