Correct spelling mistakes

Change-Id: I752dc17e8ae3e354253614bdbd5277ca1fd67469
Merge "Correct spelling mistakes"