Merge "Convert AudioAttribute to Stream correctly"