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

* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
  Partial fix for issue 3515250: video chat and SCO