Merge "ref: updating vdl files as per go/vcl/8809"