Merge "Small documentation and stylistic changes."
am: 878124c13b

Change-Id: Ica5d59801f58171eb5bbfbc8251b46dbbef94457