Fix up some documentation

Change-Id: Ie3d1ed922255cf8102a235552945ea3dce258673
Merge "Fix up some documentation"