Merge "Update the OOM pointer"