am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339'

* commit '4b187e804fdfdbc825e17646e82e0218e316a339':
  Some battery improvements: