Merge change 25931 into eclair

* changes:
  Add better APIs for the battery status, and other cleanup.