Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev