Merge "Fix OOM test case to handle more optimizations"