Merge "Update OOM APPC chart to enhance AAF support"