am 6e0b89a5: am 47c46dd5: Merge "Battery icon tweaks." into klp-dev

* commit '6e0b89a5a035fc7759714c9323d381a4cf7be3d4':
  Battery icon tweaks.