am 7a4c1afb: am 3dfa5eb9: Merge "Toward regularizing color & level across battery indicators." into klp-dev

* commit '7a4c1afb7a6fe8dbcec23cee3c1b7079a2ded81f':
  Toward regularizing color & level across battery indicators.