[scale-infra] Two time-sensitive-ish PRs