Fixed several typos

Change-Id: I006634a4b02cea488ff69967a599ea2dfc20fcd7
Merge "Fixed several typos"