Change comments as requested by code review. #10857