Merge "Reduce wake lock noise in battery history."