Merge commit 'd3a31996e6ef915bc25ff67f1f35274447a14862' * commit 'd3a31996e6ef915bc25ff67f1f35274447a14862': Fix issue 1992233: DTMF tones on Sholes is really long.
Merge commit 'd3a31996e6ef915bc25ff67f1f35274447a14862' * commit 'd3a31996e6ef915bc25ff67f1f35274447a14862': Fix issue 1992233: DTMF tones on Sholes is really long.