Merge "Sync docker image versions from manifest"