Merge commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c' * commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c': Bluetooth: API change.
Merge commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c' * commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c': Bluetooth: API change.