Merge "Fix boot VTS GetSuffix test"