Merge "Rename vbp thresholds"