Merge "Update OOF image version"