am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev

* commit '84abde71471b6631d7f12f47ef9c92360cbdbafc':
  Fix battery usage screen issues