Merge "Atoms: Bluetooth" into pi-dev
am: c154be5591

Change-Id: Ia6ca344d94ae67655116f219d5cda0f2d0a16354