[upstream] Minor text changes