Merge "[AAI] Update chart with service account"