Merge "Rename functions in libvendorsupport" into main