Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp * commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18': Work around for errant headsets.
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp * commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18': Work around for errant headsets.