Merge change I46b2df15 into eclair

* changes:
  fix [2164183] sometimes device just wants to stay asleep