Fix misspells

Change-Id: I8be38727ca55ebbead9032cf69f10a1006fd004b
Closes-bug:1257424
Merge "Fix misspells"