Merge "Sync docker manifest with OOM docker versions"