Fix comments added in change 10088