Fixed several typos

Change-Id: I6ad8231ace0d123f9700c649926da3eb85eb4716
Merge "Fixed several typos"