Merge "Fix comment wording nit"