Merge "Fix issue 3483718: audio streaming and A2DP."