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

Change-Id: I0ce0a50b794a4bbf2e565142a7f07a5a4b08fb79