am 43111e89: Merge "Battery stats: wake locks, radio active, cleanup."

* commit '43111e897be9f79ababb0ecf99f155695416d956':
  Battery stats: wake locks, radio active, cleanup.