Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev