Fix import.

6 jobs for !6777 with fix-avs-set-credential-diagnostic in 14 minutes and 53 seconds (queued for 3 seconds)
latest merge request