Merge "[AAI] Reintegrate AAI OOM charts in main repo"