am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair

Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
  Removed the device type checking