Merge "[CPS] Remove dependency to service account"