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

Change-Id: Iae5b7ebccc7a21f758897b82c6e72ba3a73624ef