Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability""