Merge "[POLICY] Upgrade image versions"