Merge "Add support for per device bluetooth configuration." into jb-mr1-dev