Merge "Change device ID test to check Bluetooth" into klp-modular-dev