am ab5efde8: Merge change Iff5b8ce3 into eclair

Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted