Merge "Remove stride from VTS classes"