am 436b93b5: am 221fa910: am d3cfb1bd: Merge change Ia48b3f2a into eclair

Merge commit '436b93b5f577549801489bff228f1a5761f331ff'

* commit '436b93b5f577549801489bff228f1a5761f331ff':
  Fix #2313887: Device doesn't boot after rebooting device...