Merge change 1192 into donut

* changes:
  Fix 1825581 - device restarts when using A2DP.