Merge branch 'bluetooth' into bugzilla/852583/bluetooth-test
Merge remote-tracking branch 'vicamo/kernel-menuconfig' into bugzilla/852583/bluetooth-test