Merge change 24114 into eclair

* changes:
  Fix issue 1992233: DTMF tones on Sholes is really long.