Fix minor spelling issues in comments

Change-Id: I46e8cd74dd2af409d502b04843ca17ef63e7e2e1
Closes-Bug: #1371499
Merge "Fix minor spelling issues in comments"