comment and review email changes

CR for 19839