Merge "Remove the docstring dependency on telephony-common" into oc-dev