Merge "Add sriov_numvfs in THT"