Merge "[POLICY] Image Versions for Maintenance 1" into honolulu