Merge "[AAI] OOM AAI Rolling Update fixes"