am 1dd789d8: Merge "Change device ID test to check Bluetooth" into klp-modular-dev

* commit '1dd789d818a1b766a4d43b26e0f291348272d1eb':
  Change device ID test to check Bluetooth