Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0