Merge "Refactor for audio device type in conversion."