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