Merge change 27073 into eclair

* changes:
  Removed the device type checking