correct typos

Change-Id: Idaeb78d66a7fdb4f75774e8a407d963f34f2bdeb
Merge "correct typos"