Merge "Explicitly include VCN API stubs" into main