fix typos

Change-Id: I44c6d58ebffb430a4c204fda052936492dfda45f
Merge "fix typos"