Fix a bunch of issues with service API docs Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853 Component: engine