Merge "Updates to AudioDevice"