Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev