am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1

* commit '733cb79a27fa434a1f5548201c953131285b4e81':
  Partial fix for issue 3515250: video chat and SCO