Merge "[AAI] Remove AAF/TLS config from charts"