comment edits
(cherry picked from commit 90e34e1a74490863c34a8b68183d0ed700b1e316)