Cleanup flake.

Merged Andrey Vertiprahov requested to merge fix-avs-cleanup-flake into master

Cleanup flake.

Merge request reports