Merge "Use customized toString for UUID in VTS" into main