Fixed several typos in comments

Change-Id: I230414c703cf47d7ec727362c20f1814324a2447
Merge "Fixed several typos in comments"