Merge "Delete oom for ocata"