Merge "VCN: Remove hidden APIs for build type and vcn service string" into main