Merge "These OOM changes are related AAF Integration"