Merge "API docs tidy up" am: 6aef6673df am: 8586776fbf am: a8e6d67fb5

Change-Id: Ia043ca171dfe1c64fc0f3295eed5547e3d0f6d47