Minor spelling fixes

Just some random spelling fixes

patch2 fixes a typo of my own

Change-Id: I018d0bfc25b104905a57bbae3baf75e07666f4af
Merge "Minor spelling fixes"