Merge "Logging and partial fix for BatteryStats lock contention"