Small typos

Change-Id: I599b5e73de2e7e900e317348fdaad6f6350bc111
Merge "Small typos"