Fixed several typos in the codebase

Change-Id: I66e05e8240cd24bc97a3591ba72023b23985f9c2
Merge "Fixed several typos in the codebase"