Fixed a handful of typos

Change-Id: Ieae86b435f9d542e1308a8e1d7d0c5cea9c7d076
Merge "Fixed a handful of typos"