Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev