Merge "Fix to make A2DP streaming work with modified SDK API" into q-keystone-qcom-dev