Merge "Fix aaa_mode for noauth K8s"