Merge "[VCN15] expose addUnwantedCapability and related APIs" into sc-dev