* commit 'f488fc28102870d8ec943d0a3a78c6d3997711c2': BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
* commit 'f488fc28102870d8ec943d0a3a78c6d3997711c2': BatteryStats: Clear power use when removing a UID from uid_cputime kernel module