Merge commit 'a526b0683dba50dac8a37ed45e3a08536044e973' * commit 'a526b0683dba50dac8a37ed45e3a08536044e973': Patch from HTC: fix improper device ID selection for BT with noise