Fix spelling errors

Change-Id: I04b49b91be3031f246ede85d369525493f88be63
Merge "Fix spelling errors"