Merge "Update VID version in manifest"