Merge "API docs tidy up" am: 6aef6673df

Change-Id: I0be18d5713fa9ad17a53cfbf2ba445a181bc4a0c