Merge "Define valid gerrit downstream for k8s aws model"