Merge "Atoms: Bluetooth" into pi-dev