fix typos

Change-Id: Ia850e62fe4c888365f5031cc8b7c7ad526600222
Merge "fix typos"