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