Merge "Remove telephony hidden api usages from commands"