Fix typos.

Change-Id: I9b2658336ac4d66df7cf745b8d58d8d49813ec16
Merge branch 'cm-11.0' into martincz