[upstream] Minor text updates