Merge "Speed up audio for CS MT call" into nyc-dev