Fixed several typos in comments

Change-Id: I230414c703cf47d7ec727362c20f1814324a2447
Remove extra whitespace

There are extra whitespace the patch file, so we should remove them to make code
more clear

Change-Id: Ic70c8cdd24d009de51f671f311c064415e02f8af
Merge "Fixed several typos in comments"
Merge "Remove extra whitespace"