Merge "Fix crash in audiosystem_tests"