Merge "[CONTRIB] Remove list from serviceaccount"