Minor code comment tweaks for spelling and consistency

Change-Id: I51391f45d0f81e4245ccc0e435a71ccd5b0e3ca3
Merge "Minor code comment tweaks for spelling and consistency"