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

Change-Id: Iabd238e291c882db18b4bca2171b7c9b5bcff9d2