Fix some spelling mistakes

Change-Id: I8da3b73d108b11dc5bb3080215f16486fec95333
Merge "Fix some spelling mistakes"