Merge change 26423 into eclair

* changes:
  Add support for Acer devices