Merge commit 'e93aca535c64c9be9564e218fb83b6bbd1b99975' * commit 'e93aca535c64c9be9564e218fb83b6bbd1b99975': Additional corrections for AudioHardware: