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

Change-Id: I62bf5f96f48b4e16e48055b490b4da92096f133e