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