Merge "[OOF] Update OOF image versions"