Merge "[OOM] Fixing k8s ServiceAccounts"