Merge commit '2790b20c537b33dbf366436f6d27776148ded490' * commit '2790b20c537b33dbf366436f6d27776148ded490': Fix media option settings for A2DP.
Merge commit '2790b20c537b33dbf366436f6d27776148ded490' * commit '2790b20c537b33dbf366436f6d27776148ded490': Fix media option settings for A2DP.