am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive...
am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
* commit 'a93369a8':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)