Merge change Icfc893d2 into eclair

* changes:
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices