Merge "Fix VintfObject to use vintf" into main