Merge "Make javadoc of companion service name more like others" into oc-dev