Merge "Update OOM to use release version"