Merge "[POLICY] Update Policy image versions"