Some minor typo fixes here and there.

Change-Id: I60a43e8ed1f2e584a60999cdbabb6adae37800db