am 3199aa7f: (-s ours) Telephony cleanup do not merge

* commit '3199aa7f8bcb48569eb8289abc055ba0f8496ba8':
  Telephony cleanup do not merge