Merge "Prep VCN files for exposing APIs"