Merge "Remove SupportedIfCapability conversion from TAPI"