Fix typos

A few more typos found by topy.

Change-Id: I2b1dbfd24881a2138fa5ba454f3382bbb8550f3c
Merge "Fix typos"