Merge "Update for OOM integration"