Merge "Fix VintfObjectTest" into main