Merge "Typos and stylistic fixes."
am: b68b354db3

* commit 'b68b354db33957cd20ca444cdb49b957781f70c9':
  Typos and stylistic fixes.

Change-Id: Ie79d5c3fa108b8b470445726c028abdd53bd6b27