Minor typos, consistency things, one grammatical error.

Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c
1 file changed