Fix some semantic mistakes and a few typos

Change-Id: Ie99519791040d96807b65ff06e090c9d585a17f4
Merge "Fix some semantic mistakes and a few typos"