Fix some typos

Change-Id: Ie9e8b654f8755958b57ec78109798f7130f2bd4c
Merge "Fix some typos"