Two minor style cleanups

Though not substantive, clean up a few minor textual points.

Change-Id: If1e69b5728b1bcd58beb912c717c432c89a49a2e
Merge "Two minor style cleanups"