Fixed some typos throughout the codebase

Change-Id: I66e421b1743f7b3e3e7ecd34e64f67b6e0a53f2c
Merge "Fixed some typos throughout the codebase"