Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev