Fix mis-spellings

Fix mis-spellings as found by the misspellings egg.

Change-Id: Ie66978098ba6d8000fb0ef282b316f42920d8638
Closes-Bug: #1257295
Merge "Fix mis-spellings"